ammeter 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ca6302a39acf11feaf4ba8a22bcba28402d841c
-  data.tar.gz: 03c39f82a6bf5cdf102dfe20adec75e092bf5bc9
+  metadata.gz: 7a15e1595dc23477cee95c4f7e815238c59be77b
+  data.tar.gz: bd903e9447a95611b53a7d15f29b58c810309ec8
 SHA512:
-  metadata.gz: 1f76eddb2fda86bc36f0ab60cf5eea848f9b2cfb5ab5673d699e3f398127599f4783ec35f8aefb773004161bc01abbe1c686f3f181da815ab88889e03e0be5c1
-  data.tar.gz: ce477ea8f9e05a7c111c85d9cf3f5a22b2743782edf333f90474e85cb52883beb076e2db13d8154cbe3879362331d626de7ada71774e27b4ad6a90fca9585e37
+  metadata.gz: 8bfb2ce3d1e364af1be88d2d8d63656fac3222ccc81cbb5ec1da0e9485b4da31ccad75b8047f3a439839b9f18285f897365c188ebd5fb4854d8b695b319318c0
+  data.tar.gz: 69d2fbe00c5ab63057c64a6020108d67d70f2215e61e7b361fc653d0198aeeee900ed81f8f4404faac4599fbbf11af5127ec243d5ef536d7ed9e6b385c1732e1

data/.travis.yml

@@ -1,21 +1,27 @@
-script: "bundle exec rake ci"
+language: ruby
+
 rvm:
-  - ruby-head
-  - 2.1.1
+  - 1.8.7
+  - 2.1.2
   - 2.0.0
   - 1.9.3
-  - 1.8.7
+  - ruby-head
   - jruby-head
   - jruby-19mode
   - rbx-19mode
+
 env:
   - RSPEC_VERSION=master
-  - RSPEC_VERSION=2.99.0.beta2
-  - RSPEC_VERSION=2.14
+  - RSPEC_VERSION='~> 3.0.0'
+  - RSPEC_VERSION='~> 2.99.0'
+  - RSPEC_VERSION='~> 2.14.0'
+
+bundler_args: "--retry=3 --jobs=3"
+
+script: "bundle exec rake ci --trace"
+
 matrix:
   allow_failures:
-    - rvm: 1.8.7
-    - rvm: 1.9.3
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: jruby-19mode

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 rspec_version = ENV['RSPEC_VERSION']
-rspec_major_version = (rspec_version && rspec_version != 'master') ? rspec_version.split('.')[0] : '3'
+rspec_major_version = (rspec_version && rspec_version != 'master') ? rspec_version.scan(/\d+/).first : '3'
 
 if rspec_version == 'master'
   gem "rspec-rails", :git => 'git://github.com/rspec/rspec-rails.git'
@@ -16,9 +16,8 @@ else
   gem 'rspec',       rspec_version
 end
 
-case rspec_major_version
-when '2'
-  # rspec 2.x does not support Rails 4.1+
+if rspec_major_version == '2' || RUBY_VERSION.to_f < 1.9
+  # rspec 2.x does not support Rails 4.1+ nor does Ruby 1.8.7
   gem 'rails', '~> 3.2'
   gem 'uglifier', '~> 1.2.4'
   gem 'rake', '~> 0.9.2.2'
@@ -26,7 +25,8 @@ when '2'
   gem 'sass-rails', '~> 3.2'
   gem 'jquery-rails', '~> 2.0'
   gem 'haml-rails', '~> 0.4'
-when '3'
+  gem 'execjs', '~> 2.0.0'
+elsif rspec_major_version == '3'
   gem 'rails', '>= 4.0'
   gem 'uglifier', '>= 1.3'
   gem 'rake', '>= 0.10'

data/Rakefile

@@ -45,9 +45,9 @@ namespace :generate do
     sh "bundle exec rails new ./tmp/example_app -m 'features/templates/generate_example_app.rb' --skip-test-unit"
     sh "cp 'features/templates/rspec.rake' ./tmp/example_app/lib/tasks"
     Dir.chdir("./tmp/example_app/") do
+      Bundler.clean_system 'bundle install'
       Bundler.clean_system 'rake db:migrate'
       Bundler.clean_system 'rails g rspec:install'
-      Bundler.clean_system 'bundle install'
     end
   end
 

data/features/generator_spec.feature

@@ -56,9 +56,12 @@ Feature: generator spec
           subject { file('public/my_dir/awesome.html') }
           it 'can run a reverse migration' do
             FileUtils.mkdir_p(File.dirname(subject))
-            File.write(subject, "test file")
+            # File.write is not in 1.8.7 use File.open
+            File.open(subject, 'w') do |f|
+              f.write "test file"
+            end
             expect(subject).to exist
-            run_generator %w(my_dir --someone Alex), behavior: :revoke
+            run_generator %w(my_dir --someone Alex), :behavior => :revoke
             expect(subject).not_to exist
           end
         end

data/features/support/env.rb

@@ -25,7 +25,7 @@ def copy_to_aruba_from(gem_or_app_name)
   }
 
   rspec_version = ENV['RSPEC_VERSION']
-  rspec_major_version = (rspec_version && rspec_version != 'master') ? rspec_version.split('.')[0] : '3'
+  rspec_major_version = (rspec_version && rspec_version != 'master') ? rspec_version.scan(/\d+/).first : '3'
 
   Dir["tmp/#{gem_or_app_name}/*"].each do |file_or_dir|
     if !(file_or_dir =~ /\/spec$/)

data/features/templates/generate_example_app.rb

@@ -1,2 +1,21 @@
-gem 'rspec-rails'#, '>=3.0.0.beta2'
+rspec_version = ENV['RSPEC_VERSION']
+rspec_major_version = (rspec_version && rspec_version != 'master') ? rspec_version.scan(/\d+/).first : '3'
+
+if rspec_version == 'master'
+  gem "rspec-rails", :git => 'git://github.com/rspec/rspec-rails.git'
+  gem "rspec", :git => 'git://github.com/rspec/rspec.git'
+  gem "rspec-core", :git => 'git://github.com/rspec/rspec-core.git'
+  gem "rspec-expectations", :git => 'git://github.com/rspec/rspec-expectations.git'
+  gem "rspec-mocks", :git => 'git://github.com/rspec/rspec-mocks.git'
+  gem "rspec-collection_matchers", :git => 'git://github.com/rspec/rspec-collection_matchers.git'
+  gem "rspec-support", :git => 'git://github.com/rspec/rspec-support.git'
+else
+  gem 'rspec-rails', rspec_version
+  gem 'rspec',       rspec_version
+end
+
 gem 'ammeter', :path=>'../..'
+if defined?(Rails) && Rails::VERSION::STRING.to_f < 4
+  # Execjs is causing problems on 1.8.7
+  gem 'execjs', '~> 2.0.0'
+end

data/features/templates/my_rails_gem/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 rspec_version = ENV['RSPEC_VERSION']
-rspec_major_version = (rspec_version && rspec_version != 'master') ? rspec_version.split('.')[0] : '3'
+rspec_major_version = (rspec_version && rspec_version != 'master') ? rspec_version.scan(/\d+/).first : '3'
 
 if rspec_version == 'master'
   gem "rspec-rails", :git => 'git://github.com/rspec/rspec-rails.git'
@@ -16,10 +16,11 @@ else
   gem 'rspec',       rspec_version
 end
 
-case rspec_major_version
-when '2'
-  gem 'rails', '~> 3.2'
-when '3'
+if rspec_major_version == '2' || RUBY_VERSION.to_f < 1.9
+  gem 'rails', '~> 3.2.0'
+  # Execjs is causing problems on 1.8.7
+  gem 'execjs', '~> 2.0.0'
+elsif rspec_major_version == '3'
   gem 'rails', '>= 4.1'
 else
   raise "rspec version #{rspec_version} is not supported"
@@ -30,4 +31,4 @@ end
 gemspec
 
 # we cannot add a development dependency with a path to my_gem.gemspec
-gem 'ammeter', :path => '../..'
+gem 'ammeter', :path => '../..'

data/features/templates/my_rails_gem/spec/spec_helper.rb

@@ -1,7 +1,10 @@
 require 'bundler/setup'
 require 'rails/all'
-# This prevents 'uninitialized constant Jquery::Rails::Railtie::PROTOTYPE_JS (NameError)'
-require 'jquery/rails'
+begin
+  # This prevents 'uninitialized constant Jquery::Rails::Railtie::PROTOTYPE_JS (NameError)'
+  require 'jquery/rails'
+rescue LoadError
+end
 
 module MyRailsGem
   module TestApp

data/features/templates/my_railties_gem/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 rspec_version = ENV['RSPEC_VERSION']
-rspec_major_version = (rspec_version && rspec_version != 'master') ? rspec_version.split('.')[0] : '3'
+rspec_major_version = (rspec_version && rspec_version != 'master') ? rspec_version.scan(/\d+/).first : '3'
 
 if rspec_version == 'master'
   gem "rspec-rails", :git => 'git://github.com/rspec/rspec-rails.git'
@@ -16,10 +16,11 @@ else
   gem 'rspec',       rspec_version
 end
 
-case rspec_major_version
-when '2'
-  gem 'railties', '~> 3.2'
-when '3'
+if rspec_major_version == '2' || RUBY_VERSION.to_f < 1.9
+  gem 'railties', '~> 3.2.0'
+  # Execjs is causing problems on 1.8.7
+  #gem 'execjs', '~> 2.0.0'
+elsif rspec_major_version == '3'
   gem 'railties', '>= 4.1'
 else
   raise "rspec version #{rspec_version} is not supported"
@@ -30,4 +31,4 @@ end
 gemspec
 
 # we cannot add a development dependency with a path to my_gem.gemspec
-gem 'ammeter', :path => '../..'
+gem 'ammeter', :path => '../..'

data/lib/ammeter/rspec/generator/matchers/have_correct_syntax.rb

@@ -30,7 +30,7 @@ RSpec::Matchers.define :have_correct_syntax do
     require 'ostruct'
 
     begin
-      view = ActionView::Template::Handlers::ERB.call(OpenStruct.new(source: code))
+      view = ActionView::Template::Handlers::ERB.call(OpenStruct.new(:source => code))
       eval('__crash_me__; ' + view)
     rescue SyntaxError
       false

data/lib/ammeter/version.rb

@@ -1,3 +1,3 @@
 module Ammeter
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'rails/all'
 require 'rspec/rails'
 
-ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
 
 module TestApp
   class Application < Rails::Application
@@ -22,4 +22,4 @@ end
 
 def stub_file(filename, content)
   allow(File).to receive(:read).with(filename).and_return(content)
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ammeter
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Alex Rothenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties