padrino-gen 0.12.0.rc3 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91185270927b70c242badab1189db4a7edaa21ec
-  data.tar.gz: ac81f2f68dfd273adede1d263e9055f21061c36d
+  metadata.gz: 529163bdc909b9c5aad2faa4ba1dcf647290eef3
+  data.tar.gz: 3fd83aca799e92e14220d0447f8a0145e279aade
 SHA512:
-  metadata.gz: 1fa158ce2281c6a1a895902a6b1a092fd3f9761479e272b85191c60018746dd6b89c9c3f74511b430e19cf6fadcd7e28c3ea1d07292edfd4c7a6748557d239e5
-  data.tar.gz: 9a10dfb30ae2a48c72d2d0f082630179e15f1127a8a19bf5b0c216ea5a39f1cc13e92fb82a76f949ff6bd5dbc467a3e3ad733a0e17719d8148b896a94f8c8e08
+  metadata.gz: 49e3c1b34292d216122cd51ce66d23359b38df3409966063f5db03ace99ea3dea3a077edc1503c6cffdb2055046625b1b47aa53acadf5913aa581ecd6891ef0a
+  data.tar.gz: 3aa0eea49ffdb6dc2b020d1a551423d68e86c71c2b942d799327ce0df3f9abb49d7eec7ecbc1843d66cc2cd696c600ffbdace4d45ec47680e10172abb2e80c52

data/lib/padrino-gen/generators/component.rb

@@ -17,7 +17,8 @@ module Padrino
 
       desc "Description:\n\n\tpadrino-gen component add components into a Padrino project"
 
-      class_option :root,    :desc => 'The root destination',                                             :aliases => '-r', :default => '.',    :type => :string
+      class_option :app,     :desc => 'The application name',                                             :aliases => '-n', :default => nil,         :type => :string
+      class_option :root,    :desc => 'The root destination',                                             :aliases => '-r', :default => '.',         :type => :string
       class_option :adapter, :desc => 'SQL adapter for ORM (sqlite, mysql, mysql2, mysql-gem, postgres)', :aliases => '-a', :default => 'sqlite',    :type => :string
 
       defines_component_options :default => false
@@ -29,6 +30,7 @@ module Padrino
         self.destination_root = options[:root]
         if in_app_root?
           @_components = options.dup.slice(*self.class.component_types)
+          @app_name = (options[:app] || "App").gsub(/\W/, '_').underscore.camelize
           if @_components.values.delete_if(&:blank?).empty?
             self.class.start(["-h"])
             say
@@ -50,6 +52,11 @@ module Padrino
               next unless yes?("Switch #{comp} to '#{choice}' from '#{existing}' ?[yes/no]:")
             end
             @project_name = fetch_component_choice(:namespace)
+            if comp.to_s == 'test' && !already_exists?(@app_name, @project_name)
+              say "#{@project_name}::#{@app_name} does not exist."
+              say "Please, change app name."
+              next
+            end
             execute_component_setup(comp, choice)
             store_component_choice(comp, choice)
             if comp.to_s == 'orm' && choice.to_s != 'none'

data/lib/padrino-gen/generators/components/orms/activerecord.rb

@@ -38,7 +38,7 @@ if ActiveRecord::VERSION::MAJOR.to_i < 4
   ActiveRecord::Base.auto_explain_threshold_in_seconds = 0.5
 end
 
-# Include Active Record class name as root for JSON serialized output.
+# Doesn't include Active Record class name as root for JSON serialized output.
 ActiveRecord::Base.include_root_in_json = false
 
 # Store the full class name (including module namespace) in STI type column.

data/lib/padrino-gen/generators/components/orms/minirecord.rb

@@ -1,4 +1,19 @@
 MR = (<<-MR) unless defined?(MR)
+##
+# You can use other adapters like:
+#
+#   ActiveRecord::Base.configurations[:development] = {
+#     :adapter   => 'mysql2',
+#     :encoding  => 'utf8',
+#     :reconnect => true,
+#     :database  => 'your_database',
+#     :pool      => 5,
+#     :username  => 'root',
+#     :password  => '',
+#     :host      => 'localhost',
+#     :socket    => '/tmp/mysql.sock'
+#   }
+#
 ActiveRecord::Base.configurations[:development] = {
 !DB_DEVELOPMENT!
 }
@@ -32,7 +47,7 @@ ActiveRecord::Base.store_full_sti_class = true
 # Use ISO 8601 format for JSON serialized times and dates.
 ActiveSupport.use_standard_json_time_format = true
 
-# Don't escape HTML entities in JSON, leave that for the json_escape helper
+# Don't escape HTML entities in JSON, leave that for the #json_escape helper
 # if you're including raw JSON in an HTML page.
 ActiveSupport.escape_html_entities_in_json = false
 
@@ -77,6 +92,8 @@ SQLITE = (<<-SQLITE) unless defined?(SQLITE)
   :adapter => 'sqlite3',
   :database => !DB_NAME!
 SQLITE
+
+
 def setup_orm
   ar = MR
   db = @project_name.underscore

data/test/helper.rb

@@ -43,7 +43,10 @@ class MiniTest::Spec
       options, model_path = {}, File.expand_path(File.join(root, "/models/**/*.rb"))
       options = params.pop if params.last.is_a?(Hash)
       Dir[model_path].each{|path| require path }
-      Array(options[:apps]).each{|app_name| require File.expand_path(File.join(root, "/#{app_name}/app.rb")) } if options[:apps]
+      Array(options[:apps]).each do |app_name|
+        path = File.expand_path(File.join(root, "/#{app_name}/app.rb"))
+        require path if File.exist?(path)
+      end if options[:apps]
     end
     "Padrino::Generators::#{name.to_s.camelize}".constantize.start(params)
     ($" - features).each{|x| $".delete(x) }

data/test/test_component_generator.rb

@@ -38,8 +38,27 @@ describe "ComponentGenerator" do
       components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
       assert_equal 'sequel', components_chosen[:orm]
     end
-  end
 
+    should "enable @app_name value" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      out, err = capture_io { generate_with_parts(:component, '--test=cucumber', "-r=#{@apptmp}/sample_project", :apps => "app") }
+      assert_match_in_file(/SampleProject::App\.tap \{ \|app\|  \}/, "#{@apptmp}/sample_project/features/support/env.rb")
+    end
+
+    should "generate component in specified app" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      capture_io { generate(:app, 'compo', "-r=#{@apptmp}/sample_project") }
+      out, err = capture_io { generate_with_parts(:component, '--test=cucumber', "--app=compo", "-r=#{@apptmp}/sample_project", :apps => "compo") }
+      assert_match_in_file(/SampleProject::Compo\.tap \{ \|app\|  \}/, "#{@apptmp}/sample_project/features/support/env.rb")
+    end
+
+    should "not generate component in specified app if the app does not exist" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}") }
+      out, err = capture_io { generate_with_parts(:component, '--test=cucumber', "--app=compo", "-r=#{@apptmp}/sample_project", :apps => "compo") }
+      assert_match(/SampleProject::Compo does not exist./, out)
+      assert_no_file_exists("#{@apptmp}/sample_project/features")
+    end
+  end
 
   context "specified of same the component" do
     should "does not change" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.12.0.rc3
+  version: 0.12.0
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc3
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc3
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -47,28 +47,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc3
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc3
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc3
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.0.rc3
+        version: 0.12.0
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com
@@ -208,9 +208,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.3.6
 requirements: []
 rubyforge_project: padrino-gen
 rubygems_version: 2.0.6