From 3ed6f0a109fff2c336e0a0b1e3f71bc901d652a7 Mon Sep 17 00:00:00 2001 From: Terry Chen Date: Tue, 27 Nov 2012 10:27:47 -0800 Subject: [PATCH 1/2] update spec --- remixr.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/remixr.gemspec b/remixr.gemspec index 8b9cfeb..e68d2f0 100644 --- a/remixr.gemspec +++ b/remixr.gemspec @@ -63,7 +63,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency(%q, ["= 0.0.3"]) s.add_runtime_dependency(%q, ["= 0.4.3"]) s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) + s.add_development_dependency(%q, [">= 0"]) s.add_development_dependency(%q, [">= 0"]) s.add_development_dependency(%q, [">= 0"]) s.add_development_dependency(%q, [">= 0"]) @@ -71,7 +71,7 @@ Gem::Specification.new do |s| s.add_dependency(%q, ["= 0.0.3"]) s.add_dependency(%q, ["= 0.4.3"]) s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) @@ -80,7 +80,7 @@ Gem::Specification.new do |s| s.add_dependency(%q, ["= 0.0.3"]) s.add_dependency(%q, ["= 0.4.3"]) s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) From 20cc080380a08c457da05e3c67895e4ebb2bd1ed Mon Sep 17 00:00:00 2001 From: Terry Chen Date: Thu, 29 Nov 2012 12:24:32 -0800 Subject: [PATCH 2/2] update version to 0.2 update to support Ruby 1.9.3 --- .gitignore | 2 +- History | 1 + Rakefile | 2 +- VERSION.yml | 2 +- lib/remixr.rb | 2 +- remixr.gemspec | 8 ++++---- test/remixr/client_test.rb | 2 +- test/test_helper.rb | 9 +++++++++ 8 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index b901c7b..81f487b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ pkg .DS_Store log doc -rmixr-*.gem +remixr-*.gem rdoc \ No newline at end of file diff --git a/History b/History index 8e67a45..61efea1 100644 --- a/History +++ b/History @@ -1 +1,2 @@ +0.0.2 - updated for ruby 1.9.3 0.0.1 - initial release \ No newline at end of file diff --git a/Rakefile b/Rakefile index 14e726e..9d93cf0 100644 --- a/Rakefile +++ b/Rakefile @@ -14,7 +14,7 @@ begin gem.files = FileList["[A-Z]*", "{examples,lib,test}/**/*"] gem.add_dependency('mash', '0.0.3') - gem.add_dependency('httparty', '0.4.3') + gem.add_dependency('httparty', '0.9') gem.add_development_dependency('thoughtbot-shoulda') gem.add_development_dependency('jeremymcanally-matchy') diff --git a/VERSION.yml b/VERSION.yml index e8fb593..8eb882f 100644 --- a/VERSION.yml +++ b/VERSION.yml @@ -1,4 +1,4 @@ --- :patch: 0 :major: 0 -:minor: 1 +:minor: 2 diff --git a/lib/remixr.rb b/lib/remixr.rb index 5383480..5072bdd 100644 --- a/lib/remixr.rb +++ b/lib/remixr.rb @@ -4,7 +4,7 @@ gem 'mash', '0.0.3' require 'mash' -gem 'httparty', '0.4.3' +gem 'httparty', '0.9' require 'httparty' class APIKeyNotSet < StandardError; end diff --git a/remixr.gemspec b/remixr.gemspec index e68d2f0..4bffc08 100644 --- a/remixr.gemspec +++ b/remixr.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = %q{remixr} - s.version = "0.1.0" + s.version = "0.2.0" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Wynn Netherland", "Jim Mulholland"] @@ -61,7 +61,7 @@ Gem::Specification.new do |s| if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then s.add_runtime_dependency(%q, ["= 0.0.3"]) - s.add_runtime_dependency(%q, ["= 0.4.3"]) + s.add_runtime_dependency(%q, ["= 0.9"]) s.add_development_dependency(%q, [">= 0"]) s.add_development_dependency(%q, [">= 0"]) s.add_development_dependency(%q, [">= 0"]) @@ -69,7 +69,7 @@ Gem::Specification.new do |s| s.add_development_dependency(%q, [">= 0"]) else s.add_dependency(%q, ["= 0.0.3"]) - s.add_dependency(%q, ["= 0.4.3"]) + s.add_dependency(%q, ["= 0.9"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) @@ -78,7 +78,7 @@ Gem::Specification.new do |s| end else s.add_dependency(%q, ["= 0.0.3"]) - s.add_dependency(%q, ["= 0.4.3"]) + s.add_dependency(%q, ["= 0.9"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) diff --git a/test/remixr/client_test.rb b/test/remixr/client_test.rb index 5fec55d..64b1dea 100644 --- a/test/remixr/client_test.rb +++ b/test/remixr/client_test.rb @@ -1,4 +1,4 @@ -require File.dirname(__FILE__) + '/../test_helper' +require_relative '../test_helper.rb' class ClientTest < Test::Unit::TestCase include Remixr diff --git a/test/test_helper.rb b/test/test_helper.rb index b0b4c24..803c673 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -5,6 +5,15 @@ require 'mocha' require 'fakeweb' +# need rails for our tests to run +gem 'actionpack', '>= 3.0.0' +gem 'activesupport', '>= 3.0.0' +gem 'activemodel', '>= 3.0.0' +gem 'railties', '>= 3.0.0' + +require 'action_controller/railtie' + + FakeWeb.allow_net_connect = false $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))