padrino-gen 0.1.5 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/generators/components/actions.rb

@@ -17,12 +17,12 @@ module Padrino
         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, :require_as => 'foo')
         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"
+          after_pattern = options[:env] ? "#{options[:env].to_s.capitalize} requirements\n" : "Component requirements\n"
+          gem_options = options.slice(:env, :require_as).collect { |k, v| "#{k.inspect} => #{v.inspect}" }.join(", ")
+          include_text = "gem '#{name}'" << (gem_options.present? ? ", #{gem_options}" : "") << "\n"
           options.merge!(:content => include_text, :after => after_pattern)
           inject_into_file('Gemfile', options[:content], :after => options[:after])
         end

data/lib/generators/components/tests/rspec_test_gen.rb

@@ -16,7 +16,7 @@ module Padrino
 
           # TODO move to spec directory to follow convention
           def setup_test
-            require_dependencies 'spec', :env => :testing
+            require_dependencies 'rspec', :env => :testing, :require_as => 'spec'
             insert_test_suite_setup RSPEC_SETUP
           end
 

data/lib/generators/skeleton/.gitignore

@@ -3,4 +3,5 @@ log/**/*
 tmp/**/*
 bin/*
 vendor/gems/*
-!vendor/gems/cache/
+!vendor/gems/cache/
+.sass-cache/*

data/padrino-gen.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-gen}
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]

data/test/test_skeleton_generator.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - Padrino Team