Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 13 files changed
  • 0 commit comments
  • 1 contributor
Commits on Mar 31, 2012
@patricksrobertson patricksrobertson [#24] Update README to reflect supported Rubies.
* Indicate deprecation of 1.8.X Ruby.
* Clearly state Rails 2.3.X is not supported.
a0ad221
@patricksrobertson patricksrobertson [#24] Update Appraisals file.
* Remove Rails 2.3 gem group.
* Add Rails 3.2 gem group.
fdb7114
@patricksrobertson patricksrobertson [#24] Update Rakefile to support TravisCI.
* Appraisal and TravisCI aren't playing nice right now.
070f09d
@patricksrobertson patricksrobertson [#24] Remove Rails 2.3 Appraisal. 916c7c5
@patricksrobertson patricksrobertson [#24] Regenerate appraisals gemfiles.
* This gives me a better appreciation for the current status of
  the travis output.
060fb2f
@patricksrobertson patricksrobertson [#24] Replace deprecated mocha method.
* Prefer have_received(method).never over should_not have_received
3ad15c0
@patricksrobertson patricksrobertson [#24] Require turn in 3.1 Gemfile.
* This enables the 3.1 cucumber specs to pass.
54c3ece
View
2 .travis.yml
@@ -4,6 +4,6 @@ rvm:
- 1.9.3
gemfile:
- - gemfiles/2.3.gemfile
- gemfiles/3.0.gemfile
- gemfiles/3.1.gemfile
+ - gemfiles/3.2.gemfile
View
13 Appraisals
@@ -1,7 +1,3 @@
-appraise '2.3' do
- gem 'rails', '2.3.14'
-end
-
appraise '3.0' do
gem 'rails', '3.0.3'
end
@@ -12,4 +8,13 @@ appraise '3.1' do
gem 'uglifier'
gem 'sass-rails'
gem 'coffee-rails'
+ gem 'turn'
+end
+
+appraise '3.2' do
+ gem 'rails', '3.2.3'
+ gem 'jquery-rails'
+ gem 'uglifier'
+ gem 'sass-rails'
+ gem 'coffee-rails'
end
View
2 Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- copycopter_client (2.0.0)
+ copycopter_client (2.0.1)
i18n (>= 0.5.0)
json
View
24 README.md
@@ -8,6 +8,30 @@ This is the Ruby on Rails client for
It uses I18n to access copy and translations from a Copycopter project.
+Supported Versions of Ruby and Rails
+------------------------------------
+The 2.X release of Copycopter Client aims to support the following Ruby interpreters:
+
+* 1.8.7 MRI
+* REE
+* 1.9.2 - 1.9.3 YARV
+* JRuby 1.6.7 (with 1.8 and 1.9 combatibility modes)
+* Rubinius 1.2 (with 1.8 and 1.9 combatibility modes)
+
+The 2.X release of Copycopter Client also aims to support the following versions of Rails:
+
+* 3.0.X
+* 3.1.X
+* 3.2.X
+
+Copycopter Client will release major gem versions that
+coincide with major version releases of Rails. With the
+release of Rails 4.0, we will be removing support of Ruby
+1.8.X and REE. If you are encountering an issue with any
+supported version of Ruby/Rails consider it a bug and report
+it.
+
+
Installation
------------
View
12 Rakefile
@@ -5,8 +5,16 @@ require 'rspec/core/rake_task'
require 'yard'
desc 'Default: run the specs and features.'
-task :default => :spec do
- system "rake -s appraisal cucumber;"
+task :default => :all
+
+desc 'Test the copycopter_client gem under all supported Rails versions.'
+task :all do |t|
+ if ENV['BUNDLE_GEMFILE']
+ exec('rake spec cucumber')
+ else
+ Rake::Task["appraisal:install"].execute
+ exec('rake appraisal spec cucumber')
+ end
end
desc 'Test the copycopter_client plugin.'
View
7 gemfiles/2.3.gemfile
@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "2.3.14"
-
-gemspec :path=>"../"
View
105 gemfiles/2.3.gemfile.lock
@@ -1,105 +0,0 @@
-PATH
- remote: /Users/croaky/dev/copycopter-ruby-client
- specs:
- copycopter_client (1.1.2)
- i18n (>= 0.5.0)
- json
-
-GEM
- remote: http://rubygems.org/
- specs:
- actionmailer (2.3.14)
- actionpack (= 2.3.14)
- actionpack (2.3.14)
- activesupport (= 2.3.14)
- rack (~> 1.1.0)
- activerecord (2.3.14)
- activesupport (= 2.3.14)
- activeresource (2.3.14)
- activesupport (= 2.3.14)
- activesupport (2.3.14)
- addressable (2.2.6)
- appraisal (0.4.0)
- bundler
- rake
- aruba (0.3.7)
- childprocess (>= 0.1.9)
- cucumber (>= 0.10.5)
- rspec (>= 2.6.0)
- bourne (1.0)
- mocha (= 0.9.8)
- builder (3.0.0)
- childprocess (0.2.2)
- ffi (~> 1.0.6)
- crack (0.3.1)
- cucumber (0.10.7)
- builder (>= 2.1.2)
- diff-lcs (>= 1.1.2)
- gherkin (~> 2.4.0)
- json (>= 1.4.6)
- term-ansicolor (>= 1.0.5)
- daemons (1.1.4)
- diff-lcs (1.1.3)
- eventmachine (0.12.10)
- ffi (1.0.11)
- gherkin (2.4.21)
- json (>= 1.4.6)
- i18n (0.6.0)
- json (1.6.1)
- mocha (0.9.8)
- rake
- rack (1.1.2)
- rails (2.3.14)
- actionmailer (= 2.3.14)
- actionpack (= 2.3.14)
- activerecord (= 2.3.14)
- activeresource (= 2.3.14)
- activesupport (= 2.3.14)
- rake (>= 0.8.3)
- rake (0.9.2)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
- sham_rack (1.3.3)
- rack
- sinatra (1.2.7)
- rack (~> 1.1)
- tilt (>= 1.2.2, < 2.0)
- sqlite3 (1.3.4)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
- term-ansicolor (1.0.7)
- thin (1.3.1)
- daemons (>= 1.0.9)
- eventmachine (>= 0.12.6)
- rack (>= 1.0.0)
- tilt (1.3.3)
- webmock (1.7.7)
- addressable (~> 2.2, > 2.2.5)
- crack (>= 0.1.7)
- yard (0.7.3)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- appraisal (~> 0.4)
- aruba (~> 0.3.2)
- bourne
- copycopter_client!
- cucumber (~> 0.10.0)
- i18n
- rails (= 2.3.14)
- rake (= 0.9.2)
- rspec (~> 2.3)
- sham_rack
- sinatra
- sqlite3-ruby
- thin
- webmock
- yard
View
53 gemfiles/3.0.gemfile.lock
@@ -1,7 +1,7 @@
PATH
- remote: /Users/croaky/dev/copycopter-ruby-client
+ remote: /Users/robertps/prob/copycopter-ruby-client
specs:
- copycopter_client (1.1.2)
+ copycopter_client (2.0.1)
i18n (>= 0.5.0)
json
@@ -35,8 +35,8 @@ GEM
activemodel (= 3.0.3)
activesupport (= 3.0.3)
activesupport (3.0.3)
- addressable (2.2.6)
- appraisal (0.4.0)
+ addressable (2.2.7)
+ appraisal (0.4.1)
bundler
rake
arel (2.0.10)
@@ -44,10 +44,10 @@ GEM
childprocess (>= 0.1.9)
cucumber (>= 0.10.5)
rspec (>= 2.6.0)
- bourne (1.0)
- mocha (= 0.9.8)
+ bourne (1.1.2)
+ mocha (= 0.10.5)
builder (2.1.2)
- childprocess (0.2.2)
+ childprocess (0.3.1)
ffi (~> 1.0.6)
crack (0.3.1)
cucumber (0.10.7)
@@ -56,7 +56,7 @@ GEM
gherkin (~> 2.4.0)
json (>= 1.4.6)
term-ansicolor (>= 1.0.5)
- daemons (1.1.4)
+ daemons (1.1.8)
diff-lcs (1.1.3)
erubis (2.6.6)
abstract (>= 1.0.0)
@@ -65,17 +65,18 @@ GEM
gherkin (2.4.21)
json (>= 1.4.6)
i18n (0.6.0)
- json (1.6.1)
+ json (1.6.6)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
- mocha (0.9.8)
- rake
+ metaclass (0.0.1)
+ mime-types (1.18)
+ mocha (0.10.5)
+ metaclass (~> 0.0.1)
polyglot (0.3.3)
- rack (1.2.4)
+ rack (1.2.5)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
@@ -94,20 +95,20 @@ GEM
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.9.2)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
+ rspec (2.9.0)
+ rspec-core (~> 2.9.0)
+ rspec-expectations (~> 2.9.0)
+ rspec-mocks (~> 2.9.0)
+ rspec-core (2.9.0)
+ rspec-expectations (2.9.0)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.9.0)
sham_rack (1.3.3)
rack
- sinatra (1.2.7)
+ sinatra (1.2.8)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
- sqlite3 (1.3.4)
+ sqlite3 (1.3.5)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
term-ansicolor (1.0.7)
@@ -121,10 +122,10 @@ GEM
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.32)
- webmock (1.7.7)
- addressable (~> 2.2, > 2.2.5)
+ webmock (1.8.5)
+ addressable (>= 2.2.7)
crack (>= 0.1.7)
- yard (0.7.3)
+ yard (0.7.5)
PLATFORMS
ruby
View
1 gemfiles/3.1.gemfile
@@ -7,5 +7,6 @@ gem "jquery-rails"
gem "uglifier"
gem "sass-rails"
gem "coffee-rails"
+gem "turn"
gemspec :path=>"../"
View
44 gemfiles/3.1.gemfile.lock
@@ -1,7 +1,7 @@
PATH
- remote: /Users/croaky/dev/copycopter-ruby-client
+ remote: /Users/robertps/prob/copycopter-ruby-client
specs:
- copycopter_client (1.1.2)
+ copycopter_client (2.0.1)
i18n (>= 0.5.0)
json
@@ -38,6 +38,7 @@ GEM
activesupport (3.1.0)
multi_json (~> 1.0)
addressable (2.2.7)
+ ansi (1.4.2)
appraisal (0.4.1)
bundler
rake
@@ -47,8 +48,8 @@ GEM
cucumber (>= 0.10.5)
rspec (>= 2.6.0)
bcrypt-ruby (3.0.1)
- bourne (1.1.1)
- mocha (= 0.10.4)
+ bourne (1.1.2)
+ mocha (= 0.10.5)
builder (3.0.0)
childprocess (0.3.1)
ffi (~> 1.0.6)
@@ -80,16 +81,16 @@ GEM
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.6.5)
+ json (1.6.6)
mail (2.3.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
- mime-types (1.17.2)
- mocha (0.10.4)
+ mime-types (1.18)
+ mocha (0.10.5)
metaclass (~> 0.0.1)
- multi_json (1.1.0)
+ multi_json (1.2.0)
polyglot (0.3.3)
rack (1.3.6)
rack-cache (1.0.3)
@@ -120,19 +121,19 @@ GEM
rake (0.9.2)
rdoc (3.12)
json (~> 1.4)
- rspec (2.8.0)
- rspec-core (~> 2.8.0)
- rspec-expectations (~> 2.8.0)
- rspec-mocks (~> 2.8.0)
- rspec-core (2.8.0)
- rspec-expectations (2.8.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.8.0)
+ rspec (2.9.0)
+ rspec-core (~> 2.9.0)
+ rspec-expectations (~> 2.9.0)
+ rspec-mocks (~> 2.9.0)
+ rspec-core (2.9.0)
+ rspec-expectations (2.9.0)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.9.0)
sass (3.1.15)
- sass-rails (3.1.5)
+ sass-rails (3.1.6)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
- sass (~> 3.1.10)
+ sass (>= 3.1.10)
tilt (~> 1.3.2)
sham_rack (1.3.3)
rack
@@ -157,11 +158,13 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
+ turn (0.9.4)
+ ansi
tzinfo (0.3.32)
- uglifier (1.2.3)
+ uglifier (1.2.4)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- webmock (1.8.3)
+ webmock (1.8.5)
addressable (>= 2.2.7)
crack (>= 0.1.7)
yard (0.7.5)
@@ -186,6 +189,7 @@ DEPENDENCIES
sinatra
sqlite3-ruby
thin
+ turn
uglifier
webmock
yard
View
11 gemfiles/3.2.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "3.2.3"
+gem "jquery-rails"
+gem "uglifier"
+gem "sass-rails"
+gem "coffee-rails"
+
+gemspec :path=>"../"
View
186 gemfiles/3.2.gemfile.lock
@@ -0,0 +1,186 @@
+PATH
+ remote: /Users/robertps/prob/copycopter-ruby-client
+ specs:
+ copycopter_client (2.0.1)
+ i18n (>= 0.5.0)
+ json
+
+GEM
+ remote: http://rubygems.org/
+ specs:
+ actionmailer (3.2.3)
+ actionpack (= 3.2.3)
+ mail (~> 2.4.4)
+ actionpack (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
+ builder (~> 3.0.0)
+ activerecord (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ arel (~> 3.0.2)
+ tzinfo (~> 0.3.29)
+ activeresource (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ activesupport (3.2.3)
+ i18n (~> 0.6)
+ multi_json (~> 1.0)
+ addressable (2.2.7)
+ appraisal (0.4.1)
+ bundler
+ rake
+ arel (3.0.2)
+ aruba (0.3.7)
+ childprocess (>= 0.1.9)
+ cucumber (>= 0.10.5)
+ rspec (>= 2.6.0)
+ bourne (1.1.2)
+ mocha (= 0.10.5)
+ builder (3.0.0)
+ childprocess (0.3.1)
+ ffi (~> 1.0.6)
+ coffee-rails (3.2.2)
+ coffee-script (>= 2.2.0)
+ railties (~> 3.2.0)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.2.0)
+ crack (0.3.1)
+ cucumber (0.10.7)
+ builder (>= 2.1.2)
+ diff-lcs (>= 1.1.2)
+ gherkin (~> 2.4.0)
+ json (>= 1.4.6)
+ term-ansicolor (>= 1.0.5)
+ daemons (1.1.8)
+ diff-lcs (1.1.3)
+ erubis (2.7.0)
+ eventmachine (0.12.10)
+ execjs (1.3.0)
+ multi_json (~> 1.0)
+ ffi (1.0.11)
+ gherkin (2.4.21)
+ json (>= 1.4.6)
+ hike (1.2.1)
+ i18n (0.6.0)
+ journey (1.0.3)
+ jquery-rails (2.0.1)
+ railties (>= 3.2.0, < 5.0)
+ thor (~> 0.14)
+ json (1.6.6)
+ mail (2.4.4)
+ i18n (>= 0.4.0)
+ mime-types (~> 1.16)
+ treetop (~> 1.4.8)
+ metaclass (0.0.1)
+ mime-types (1.18)
+ mocha (0.10.5)
+ metaclass (~> 0.0.1)
+ multi_json (1.2.0)
+ polyglot (0.3.3)
+ rack (1.4.1)
+ rack-cache (1.2)
+ rack (>= 0.4)
+ rack-protection (1.2.0)
+ rack
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
+ rack (>= 1.0)
+ rails (3.2.3)
+ actionmailer (= 3.2.3)
+ actionpack (= 3.2.3)
+ activerecord (= 3.2.3)
+ activeresource (= 3.2.3)
+ activesupport (= 3.2.3)
+ bundler (~> 1.0)
+ railties (= 3.2.3)
+ railties (3.2.3)
+ actionpack (= 3.2.3)
+ activesupport (= 3.2.3)
+ rack-ssl (~> 1.3.2)
+ rake (>= 0.8.7)
+ rdoc (~> 3.4)
+ thor (~> 0.14.6)
+ rake (0.9.2)
+ rdoc (3.12)
+ json (~> 1.4)
+ rspec (2.9.0)
+ rspec-core (~> 2.9.0)
+ rspec-expectations (~> 2.9.0)
+ rspec-mocks (~> 2.9.0)
+ rspec-core (2.9.0)
+ rspec-expectations (2.9.0)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.9.0)
+ sass (3.1.15)
+ sass-rails (3.2.5)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ sham_rack (1.3.3)
+ rack
+ sinatra (1.3.2)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
+ tilt (~> 1.3, >= 1.3.3)
+ sprockets (2.1.2)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.5)
+ sqlite3-ruby (1.3.3)
+ sqlite3 (>= 1.3.3)
+ term-ansicolor (1.0.7)
+ thin (1.3.1)
+ daemons (>= 1.0.9)
+ eventmachine (>= 0.12.6)
+ rack (>= 1.0.0)
+ thor (0.14.6)
+ tilt (1.3.3)
+ treetop (1.4.10)
+ polyglot
+ polyglot (>= 0.3.1)
+ tzinfo (0.3.32)
+ uglifier (1.2.4)
+ execjs (>= 0.3.0)
+ multi_json (>= 1.0.2)
+ webmock (1.8.5)
+ addressable (>= 2.2.7)
+ crack (>= 0.1.7)
+ yard (0.7.5)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ appraisal (~> 0.4)
+ aruba (~> 0.3.2)
+ bourne
+ coffee-rails
+ copycopter_client!
+ cucumber (~> 0.10.0)
+ i18n
+ jquery-rails
+ rails (= 3.2.3)
+ rake (= 0.9.2)
+ rspec (~> 2.3)
+ sass-rails
+ sham_rack
+ sinatra
+ sqlite3-ruby
+ thin
+ uglifier
+ webmock
+ yard
View
4 spec/copycopter_client/request_sync_spec.rb
@@ -38,10 +38,10 @@
it "does not flush defaults" do
subject.call(env)
- cache.should_not have_received(:flush)
+ cache.should have_received(:flush).never
end
it "does not download new copy" do
subject.call(env)
- cache.should_not have_received(:download)
+ cache.should have_received(:download).never
end
end

No commit comments for this range

Something went wrong with that request. Please try again.