scaffoldhub 0.0.8 → 0.0.10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scaffoldhub (0.0.8)
+    scaffoldhub (0.0.10)
       rails
 
 GEM

data/lib/generators/new_scaffold/templates/scaffold_spec.rb.erb

@@ -58,4 +58,7 @@ Scaffoldhub::Specification.new do
   # Copy any file without running an ERB transformation
   # file 'xyz.html', :dest => 'path/to/xyz.html'
 
+  # Add a gem to the Gemfile
+  # gem 'some_gem', '1.0'
+  # gem "some_other_gem", :group => :test, :git => "git://github.com/rails/rails"
 end

data/lib/generators/scaffoldhub/scaffoldhub_generator.rb

@@ -21,4 +21,10 @@ class ScaffoldhubGenerator < Rails::Generators::ScaffoldGenerator
       copy_file template_file.src, replace_name_tokens(template_file.dest)
     end
   end
+
+  def add_gems_to_gemfile
+    each_gem do |args|
+      gem(*args)
+    end
+  end
 end

data/lib/scaffoldhub.rb

@@ -6,6 +6,6 @@ require 'scaffoldhub/helper'
 require 'scaffoldhub/runner'
 
 module Scaffoldhub
-  VERSION = '0.0.8'
+  VERSION = '0.0.10'
   SCAFFOLD_HUB_SERVER = 'scaffoldhub.org'
 end

data/lib/scaffoldhub/helper.rb

@@ -41,6 +41,23 @@ module Scaffoldhub
       end
     end
 
+    def each_gem
+      begin
+        gems = scaffold_spec.gems.each do |gem|
+          yield gem
+        end
+      rescue Errno::ENOENT => e
+        say_status :error, e.message, :red
+        nil
+      rescue Scaffoldhub::NotFoundException => e
+        say_status :error, "HTTP 404 not found error for #{e.message}", :red
+        nil
+      rescue Scaffoldhub::NetworkErrorException => e
+        say_status :error, "HTTP error connecting to #{e.message}", :red
+        nil
+      end
+    end
+
     def scaffold_spec
       Helper.scaffold_spec ||= download_scaffold_spec!
     end

data/lib/scaffoldhub/scaffold_spec.rb

@@ -73,6 +73,14 @@ module Scaffoldhub
       end
     end
 
+    def gems
+      if @local
+        Specification.gems
+      else
+        YAML::load(@spec[:gems])
+      end
+    end
+
     def to_yaml
       Specification.to_yaml if @local
     end

data/lib/scaffoldhub/specification.rb

@@ -42,10 +42,11 @@ module Scaffoldhub
     mattr_accessor        :name, :description, :base_url, :blog_post, :screenshot, :parameter_example
     define_dsl_attributes :name, :description, :base_url, :blog_post, :screenshot, :parameter_example
 
-    mattr_accessor :files, :errors, :tags
+    mattr_accessor :files, :errors, :tags, :gems
     @@files  = []
     @@errors = []
     @@tags   = []
+    @@gems   = []
 
     define_dsl_file_keyword :model, :migration, :controller, :view, :layout
 
@@ -65,6 +66,7 @@ module Scaffoldhub
           :description => description,
           :base_url    => adjusted_base_url,
           :blog_post   => blog_post,
+          :gems        => gems,
           :files       => files,
           :screenshot  => screenshot,
           :tags        => tags,
@@ -155,6 +157,10 @@ module Scaffoldhub
       self.class.add_tag(keyword)
     end
 
+    def gem(*args)
+      @@gems << args
+    end
+
     protected
 
     def join_with_parent(parent_value, new_value)

data/spec/fixtures/test_scaffold.rb

@@ -18,13 +18,13 @@ Scaffoldhub::Specification.new do
     # Tag(s) to help scaffoldhub.org users find your scaffold
     tag 'jquery'
     tag 'autocomplete'
-  end
 
-  # Optionally specify an example of a scaffold parameter
-  parameter_example 'FIELD_NAME'
+    # Optionally specify an example of a scaffold parameter
+    parameter_example 'FIELD_NAME'
 
-  # Optionally post a link to an article you write explaining how the scaffold works.
-  blog_post 'http://patshaughnessy.net/2011/3/13/view-mapper-for-rails-3-scaffoldhub'
+    # Optionally post a link to an article you write explaining how the scaffold works.
+    blog_post 'http://patshaughnessy.net/2011/3/13/view-mapper-for-rails-3-scaffoldhub'
+  end
 
   # Define a model template - this ERB file will be used to generate a new
   # model class with this path & filename: app/models/NAME.rb
@@ -38,9 +38,8 @@ Scaffoldhub::Specification.new do
   # view file with this path & filename: app/views/PLURAL_NAME/view_file_name.rb
   view 'templates/_form.html.erb'
 
-  # Define a view layout template - this ERB file will be used to generate a new
-  # view layout file with this path & filename: app/views/layouts/PLURAL_NAME.html.erb
-  layout 'templates/layout.erb'
+  gem 'some_gem', '1.0'
+  gem "some_other_gem", :group => :test, :git => "git://github.com/rails/rails"
 
   # You can use "with_options" to specify the same source folder for a series of templates:
   with_options :src => 'templates' do

data/spec/scaffold_spec_spec.rb

@@ -13,6 +13,9 @@ describe Scaffoldhub::ScaffoldSpec do
   before do
     @status_proc = mock
     @status_proc.stubs(:call)
+    Scaffoldhub::Specification.files    = []
+    Scaffoldhub::Specification.gems     = []
+    Scaffoldhub::Specification.base_url = nil
   end
 
   describe 'parsing scaffold spec' do
@@ -34,6 +37,13 @@ describe Scaffoldhub::ScaffoldSpec do
         subject.blog_post.should == 'http://patshaughnessy.net/2011/3/13/view-mapper-for-rails-3-scaffoldhub'
       end
 
+      it 'should parse all of the gems' do
+        subject.gems.should == [
+          [ 'some_gem', '1.0' ],
+          [ 'some_other_gem', { :group => :test, :git => 'git://github.com/rails/rails' } ]
+        ]
+      end
+
       it 'should parse the model file' do
         model_spec = subject.template_file_specs.detect { |spec| spec[:type] == :model }
         find_spec(subject, :model, 'templates/model.rb').should_not be_nil
@@ -47,10 +57,6 @@ describe Scaffoldhub::ScaffoldSpec do
         find_spec(subject, :view, 'templates/_form.html.erb').should_not be_nil
       end
 
-      it 'should parse a layout file' do
-        find_spec(subject, :layout, 'templates/layout.erb').should_not be_nil
-      end
-
       it 'should parse with_options and use :src as a folder for the given file' do
         find_spec(subject, :view, 'templates/new.html.erb').should_not be_nil
         find_spec(subject, :view, 'templates/edit.html.erb').should_not be_nil
@@ -96,24 +102,29 @@ describe Scaffoldhub::ScaffoldSpec do
 
     describe 'parsing remote scaffold spec' do
 
-      before do
-        Scaffoldhub::Specification.files = []
-        Scaffoldhub::Specification.base_url = nil
-      end
-
       TEST_YAML = <<YAML
+--- 
+:base_url: http://github.com/patshaughnessy/scaffolds/default
+:files: 
+- :src: templates/index3.html.erb
+  :dest: 
+  :rename: 
+  :type: view
+- :src: templates/index2.html.erb
+  :dest: 
+  :rename: new_file_name.rb
+  :type: controller
+- :src: templates/index.html.erb
+  :dest: app/views/welcome
+  :rename:
+  :type: file
+:gems: |
   --- 
-  :base_url: http://github.com/patshaughnessy/scaffolds/default
-  :files: 
-  - :src: templates/index3.html.erb
-    :dest: 
-    :type: view
-  - :src: templates/index2.html.erb
-    :dest: 
-    :type: controller
-  - :src: templates/index.html.erb
-    :dest: app/views/welcome
-    :type: file
+  - - some_gem
+    - "1.0"
+  - - some_other_gem
+    - :group: :test
+      :git: git://github.com/rails/rails
 YAML
 
       subject do
@@ -121,19 +132,21 @@ YAML
       end
 
       before do
-        Scaffoldhub::Specification.files = []
-        Scaffoldhub::Specification.base_url = nil
         subject.expects(:remote_file_contents!).returns(TEST_YAML)
       end
 
       it 'should parse a remote yaml scaffold' do
         subject.download_and_parse!
         subject.template_file_specs.should == [
-          { :type => 'view',       :src => 'templates/index3.html.erb', :dest => nil },
-          { :type => 'controller', :src => 'templates/index2.html.erb', :dest => nil },
-          { :type => 'file',       :src => 'templates/index.html.erb',  :dest => 'app/views/welcome' }
+          { :type => 'view',       :src => 'templates/index3.html.erb', :dest => nil,                 :rename => nil },
+          { :type => 'controller', :src => 'templates/index2.html.erb', :dest => nil,                 :rename => 'new_file_name.rb' },
+          { :type => 'file',       :src => 'templates/index.html.erb',  :dest => 'app/views/welcome', :rename => nil }
         ]
         subject.base_url.should == 'http://github.com/patshaughnessy/scaffolds/default'
+        subject.gems.should == [
+          [ 'some_gem', '1.0' ],
+          [ 'some_other_gem', { :group => :test, :git => 'git://github.com/rails/rails' } ]
+        ]
       end
     end
   end
@@ -154,6 +167,10 @@ YAML
       parsed_yaml[:blog_post].should         == 'http://patshaughnessy.net/2011/3/13/view-mapper-for-rails-3-scaffoldhub'
       parsed_yaml[:name].should              == 'test_scaffold'
       parsed_yaml[:description].should       == 'The test_scaffold scaffold.'
+      parsed_yaml[:gems].should              == [
+        [ 'some_gem', '1.0' ],
+        [ 'some_other_gem', { :group => :test, :git => 'git://github.com/rails/rails' } ]
+      ]
       parsed_yaml[:parameter_example].should == 'FIELD_NAME'
       model_spec = find_spec_in_array(parsed_yaml[:files], :model, 'templates/model.rb')
       model_spec.should_not be_nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scaffoldhub
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - Pat Shaughnessy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-08 00:00:00 -04:00
+date: 2011-05-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency