ammeter 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f14d89dc8ba87e492a772bd8e81a8370641b8bd
-  data.tar.gz: bea93658480644d813daafa47b58510c7d9c856b
+  metadata.gz: 5ca6302a39acf11feaf4ba8a22bcba28402d841c
+  data.tar.gz: 03c39f82a6bf5cdf102dfe20adec75e092bf5bc9
 SHA512:
-  metadata.gz: 24107720705e3ff11ba9691b762c43fe2b0d09c2608e00c9438a4ae25699acbc3f27993169c40f739fd30a66fc3a7ff65281ed9673a43330eaeb534b6858dbfa
-  data.tar.gz: 7687869b3fddd91f0fba62b628b23f3059befdfba8bdfd1cb25f08bfa64864237ac121152aaef5ebef12999a36f1a05002a8430e966179e676890811673f3e7c
+  metadata.gz: 1f76eddb2fda86bc36f0ab60cf5eea848f9b2cfb5ab5673d699e3f398127599f4783ec35f8aefb773004161bc01abbe1c686f3f181da815ab88889e03e0be5c1
+  data.tar.gz: ce477ea8f9e05a7c111c85d9cf3f5a22b2743782edf333f90474e85cb52883beb076e2db13d8154cbe3879362331d626de7ada71774e27b4ad6a90fca9585e37

data/features/generator_spec.feature

@@ -10,13 +10,14 @@ Feature: generator spec
       class AwesomeGenerator < Rails::Generators::NamedBase
         source_root File.expand_path('../templates', __FILE__)
         class_option :super, :type => :boolean, :default => false
+        class_option :someone, :type => :string
 
         def create_awesomeness
           template 'awesome.html', File.join('public', name, "#{"super_" if options[:super]}awesome.html")
         end
 
         def create_lameness
-          template 'lame.html', File.join('public', name, "#{"super_" if options[:super]}lame.html")
+          template 'lame.html.erb', File.join('public', name, "#{"super_" if options[:super]}lame.html")
         end
       end
       """
@@ -24,9 +25,9 @@ Feature: generator spec
       """
       This is an awesome file
       """
-    And a file named "lib/generators/awesome/templates/lame.html" with:
+    And a file named "lib/generators/awesome/templates/lame.html.erb" with:
       """
-      This is a lame file
+      <%= options[:someone] %> is lame
       """
 
   Scenario: A spec that runs the entire generator
@@ -36,23 +37,35 @@ Feature: generator spec
       require 'generators/awesome/awesome_generator'
 
       describe AwesomeGenerator do
-        before { run_generator %w(my_dir) }
-        describe 'public/my_dir/awesome.html' do
-          subject { file('public/my_dir/awesome.html') }
-          it { expect(subject).to exist }
-          it { expect(subject).to contain 'This is an awesome file' }
-          it { expect(subject).to_not contain 'This text is not in the file' }
+        describe 'invoke' do
+          before { run_generator %w(my_dir --someone Alex) }
+          describe 'public/my_dir/awesome.html' do
+            subject { file('public/my_dir/awesome.html') }
+            it { expect(subject).to exist }
+            it { expect(subject).to contain 'This is an awesome file' }
+            it { expect(subject).to_not contain 'This text is not in the file' }
+          end
+          describe 'public/my_dir/lame.html' do
+            subject { file('public/my_dir/lame.html') }
+            it { expect(subject).to exist }
+            it { expect(subject).to contain 'Alex is lame' }
+            it { expect(subject).to_not contain 'This text is not in the file' }
+          end
         end
-        describe 'public/my_dir/lame.html' do
-          subject { file('public/my_dir/lame.html') }
-          it { expect(subject).to exist }
-          it { expect(subject).to contain 'This is a lame file' }
-          it { expect(subject).to_not contain 'This text is not in the file' }
+        describe 'revoke' do
+          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")
+            expect(subject).to exist
+            run_generator %w(my_dir --someone Alex), behavior: :revoke
+            expect(subject).not_to exist
+          end
         end
       end
       """
     When I run `rake spec`
-    Then the output should contain "6 examples, 0 failures"
+    Then the output should contain "7 examples, 0 failures"
 
   Scenario: A spec that runs one task in the generator
     Given a file named "spec/generators/another_awesome_generator_spec.rb" with:

data/lib/ammeter/init.rb

@@ -3,6 +3,7 @@ if RSpec::Core::Version::STRING < '3'
   require 'ammeter/rspec/rspec_2_compatibility'  # if rspec2
 end
 require 'rails'
+require 'ammeter/output_capturer.rb'
 require 'ammeter/rspec/generator/example.rb'
 require 'ammeter/rspec/generator/matchers.rb'
 

data/lib/ammeter/output_capturer.rb

@@ -0,0 +1,40 @@
+module Ammeter
+  class OutputCapturer
+    # Is this thread safe!?!?
+    # This won't work with sub-processes
+    def self.capture(io, &block)
+      case io
+      when :stdout
+        capture_stdout(&block)
+      when :stderr
+        capture_stderr(&block)
+      else
+        raise "Unknown IO #{io}"
+      end
+    end
+
+    def self.capture_stdout(&block)
+      captured_stream = StringIO.new
+
+      orginal_io, $stdout = $stdout, captured_stream
+
+      block.call
+
+      captured_stream.string
+    ensure
+      $stdout = orginal_io
+    end
+
+    def self.capture_stderr(&block)
+      captured_stream = StringIO.new
+
+      orginal_io, $stderr = $stderr, captured_stream
+
+      block.call
+
+      captured_stream.string
+    ensure
+      $stderr = orginal_io
+    end
+  end
+end

data/lib/ammeter/rspec/generator/example/generator_example_group.rb

@@ -13,7 +13,7 @@ module Ammeter
         extend ActiveSupport::Concern
         include ::RSpec::Rails::RailsExampleGroup
 
-        DELEGATED_METHODS = [:capture, :destination_root, :current_path, :generator_class]
+        DELEGATED_METHODS = [:destination_root, :current_path, :generator_class]
         module ClassMethods
           mattr_accessor :test_unit_test_case_delegate
           delegate :default_arguments, :to => :'self.test_unit_test_case_delegate'
@@ -44,12 +44,12 @@ module Ammeter
           end
 
           def run_generator(given_args=self.default_arguments, config={})
-            capture(:stdout) { generator(given_args, config).invoke_all }
+            OutputCapturer.capture(:stdout) { generator(given_args, config).invoke_all }
           end
         end
 
         def invoke_task name
-          capture(:stdout) { generator.invoke_task(generator_class.all_tasks[name.to_s]) }
+          OutputCapturer.capture(:stdout) { generator.invoke_task(generator_class.all_tasks[name.to_s]) }
         end
 
         included do

data/lib/ammeter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ammeter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Alex Rothenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -238,6 +238,7 @@ files:
 - features/templates/rspec.rake
 - lib/ammeter.rb
 - lib/ammeter/init.rb
+- lib/ammeter/output_capturer.rb
 - lib/ammeter/railtie.rb
 - lib/ammeter/rspec/generator/example.rb
 - lib/ammeter/rspec/generator/example/generator_example_group.rb