sinatra_more 0.3.23 → 0.3.24

data/VERSION

@@ -1 +1 @@
-0.3.23
+0.3.24

data/generators/components/component_actions.rb

@@ -9,12 +9,15 @@ module SinatraMore
     end
 
     # Inserts a required gem into the Gemfile to add the bundler dependency
-    # insert_dependency_to_gemfile(name)
-    # insert_dependency_to_gemfile(name, :env => :testing)
+    # insert_into_gemfile(name)
+    # insert_into_gemfile(name, :env => :testing)
     def insert_into_gemfile(name, options={})
       after_pattern = "# Component requirements\n"
       after_pattern = "# #{options[:env].to_s.capitalize} requirements\n" if environment = options[:env]
-      include_text = "gem '#{name}'" << (environment ? ", :only => #{environment.inspect}" : "") << "\n"
+      include_text = "gem '#{name}'" 
+      include_text << ", :require_as => #{options[:require_as].inspect}" if options[:require_as]
+      include_text << ", :only => #{environment.inspect}" if environment
+      include_text << "\n"
       options.merge!(:content => include_text, :after => after_pattern)
       inject_into_file('Gemfile', options[:content], :after => options[:after])
     end

data/generators/components/tests/rspec_test_gen.rb

@@ -11,7 +11,7 @@ end
 TEST
 
     def setup_test
-      require_dependencies 'rspec', :env => :testing
+      insert_into_gemfile 'rspec', :require_as => 'spec', :env => :testing
       insert_test_suite_setup RSPEC_SETUP
     end
     

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.23"
+  s.version = "0.3.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]

data/test/generators/test_skeleton_generator.rb

@@ -168,7 +168,7 @@ class TestSkeletonGenerator < Test::Unit::TestCase
     should "properly generate for rspec" do
       buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--test=rspec', '--script=none']) }
       assert_match /Applying.*?rspec.*?test/, buffer
-      assert_match_in_file(/gem 'rspec'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/gem 'rspec', :require_as => "spec"/, '/tmp/sample_app/Gemfile')
       assert_match_in_file(/Spec::Runner/, '/tmp/sample_app/test/test_config.rb')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.23
+  version: 0.3.24
 platform: ruby
 authors: 
 - Nathan Esquenazi