beet 0.3.1 → 0.4.0

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.email = "jack.dempsey@gmail.com"
     gem.homepage = "http://github.com/jackdempsey/beet"
     gem.authors = ["Jack Dempsey"]
-    gem.add_dependency "wycats-thor", "= 0.11.5"
+    gem.add_dependency "thor", "~> 0.11.6"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/beet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beet}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Dempsey"]
-  s.date = %q{2009-10-24}
+  s.date = %q{2009-11-03}
   s.default_executable = %q{beet}
   s.email = %q{jack.dempsey@gmail.com}
   s.executables = ["beet"]
@@ -79,11 +79,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<wycats-thor>, ["= 0.11.5"])
+      s.add_runtime_dependency(%q<thor>, ["~> 0.11.6"])
     else
-      s.add_dependency(%q<wycats-thor>, ["= 0.11.5"])
+      s.add_dependency(%q<thor>, ["~> 0.11.6"])
     end
   else
-    s.add_dependency(%q<wycats-thor>, ["= 0.11.5"])
+    s.add_dependency(%q<thor>, ["~> 0.11.6"])
   end
 end

data/bin/beet

@@ -26,14 +26,14 @@ class BeetRunner < Thor
   map "--display" => :display
 
   desc 'generate [app_name]', "the main app generate method"
-  method_options %w(recipes -r) => :string, %w(gems -g) => :string, %w(template -t) => :string, %w(save -s) => :string, %w(use -u) => :string
+  method_options %w(recipes -r) => :string, %w(gems) => :string, %w(template -t) => :string, %w(save -s) => :string, %w(use -u) => :string
   def generate(app_name, project_type=:rails)
     executor = Beet::Executor.new(app_name, options.merge('project_type' => project_type))
     executor.start
   end
 
   desc 'just_recipe', "when you just need a recipe"
-  method_options %w(recipes -r) => :string, %w(gems -g) => :string, %w(save -s) => :string, %w(use -u) => :string
+  method_options %w(recipes -r) => :string, %w(gems) => :string, %w(save -s) => :string, %w(use -u) => :string
   def just_recipe(app_name='.')
     executor = Beet::Executor.new(app_name, options.merge('generate' => false))
     executor.start
@@ -77,6 +77,10 @@ class BeetRunner < Thor
       -g, --generate                   Run the generate command to build a project
       -j, --just_recipe                Run the just_recipe command to only run specified recipes, templates, etc.
       -d, --display                    Instead of running, show the template or recipe body
+      -r, --recipes                    Recipes to use
+      -s, --save                       Save current set of options
+      -u, --use                        Use a saved set of options
+      --gems                           Gems to include
 
       Beet Info:
       -v, --version                    Show the Beet version number and quit.

data/lib/beet/executor.rb

@@ -119,7 +119,9 @@ module Beet
     def add_gems
       if @gems
         @gems.each do |gem_data|
-          gem(gem_data[:name], :source => gem_data[:source])
+          duped_data = gem_data.clone # to avoid removing :name from @gems
+          name = duped_data.delete(:name)
+          gem(name, duped_data)
         end
       end
     end
@@ -127,10 +129,14 @@ module Beet
     def extract_commands_from_options
       if @options[:gems]
         @options[:gems].split(/[\s,]+/).each do |gem|
-          if location = gem_location(gem)
-            @gems << {:name => gem, :source => location}
+          if gem_info = gem_location(gem)
+            if gem_info.is_a?(Hash)
+              @gems << {:name => gem}.merge(gem_info)
+            else
+              @gems << {:name => gem, :source => gem_info}
+            end
           else
-            puts "gem: #{gem} not found. Did you spell it correctly? If so, submit a patch with its location!"
+            @gems << {:name => gem}
           end
         end
       end

data/lib/beet/gem_location_map.rb

@@ -61,4 +61,5 @@ GEM_LOCATIONS = {
   'passenger'              => 'git://github.com/FooBarWidget/passenger.git',
   'thin'                   => 'git://github.com/macournoyer/thin.git',
   'happymapper'            => 'git://github.com/jnunemaker/happymapper.git',
+  'simple-navigation'      => {:source => 'git://github.com/andi/simple-navigation.git', :lib => 'simple_navigation'}
 }

data/lib/beet/recipes/passenger/vhost.rb

@@ -12,6 +12,6 @@ RackEnv development
 }.strip
 end
 default_to = "/etc/apache2/passenger_pane_vhosts"
-answer = ask "Write file to: [#{default_to} default]"
+answer = ask "Where should we write out vhost config: [#{default_to} is default]"
 filename = answer.empty? ? default_to : answer
 sudo "mv ./#{project_name}.local.vhost.conf #{filename}"

data/lib/beet/recipes/rails/authlogic.rb

@@ -291,7 +291,12 @@ end
 
 gem 'authlogic', :version => '~> 2.0.0'
 
-rake "gems:install", :sudo => true
+if yes?("Install using sudo?")
+  rake "gems:install", :sudo => true
+else
+  rake "gems:install"
+end
+
 rake "db:create:all"
 rake "db:migrate"
 

data/lib/beet/template_location_map.rb

@@ -2,6 +2,8 @@ TEMPLATE_LOCATIONS = {
   'browsercms'        => 'http://github.com/browsermedia/browsercms/raw/master/templates/blank.rb',
   'browsercms_demo'   => 'http://github.com/browsermedia/browsercms/raw/master/templates/demo.rb',
   'bort'              => 'http://github.com/jeremymcanally/rails-templates/raw/master/bort.rb',
+  'bundler'           => 'http://github.com/tomafro/dotfiles/raw/master/resources/rails/bundler.rb',
+  'compass'           => 'http://github.com/chriseppstein/compass/raw/master/lib/compass/app_integration/rails/templates/compass-install-rails.rb',
   'daring'            => 'http://github.com/jeremymcanally/rails-templates/raw/master/daring.rb',
   'datamapper'        => 'http://github.com/jeremymcanally/rails-templates/raw/master/datamapper.rb',
   'entp'              => 'http://github.com/jeremymcanally/rails-templates/raw/master/entp.rb',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: beet
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Jack Dempsey
@@ -9,18 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-24 00:00:00 -04:00
+date: 2009-11-03 00:00:00 -05:00
 default_executable: beet
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: wycats-thor
+  name: thor
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.11.5
+        version: 0.11.6
     version: 
 description: 
 email: jack.dempsey@gmail.com