jackdempsey-beet 0.1.8 → 0.1.9

data/TODO

@@ -13,4 +13,6 @@ and want to verify things worked correctly
 
 * work on ubuntu install ideas
 
-* add a nicer looking prompt for when you ask a question of the user
+* create a "if gem_exists?('browsercms')" type method
+
+* print out a warning message if a recipe isn't found

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/beet.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beet}
-  s.version = "0.1.8"
+  s.version = "0.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Dempsey"]
-  s.date = %q{2009-06-06}
+  s.date = %q{2009-06-07}
   s.default_executable = %q{beet}
   s.email = %q{jack.dempsey@gmail.com}
   s.executables = ["beet"]
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/beet/recipes/rack/middleware.rb",
      "lib/beet/recipes/rails/authlogic.rb",
      "lib/beet/recipes/rails/clean_files.rb",
+     "lib/beet/recipes/rails/cms/bcms_blog.rb",
      "lib/beet/recipes/rails/css/blueprint.rb",
      "lib/beet/recipes/rails/css/reset.rb",
      "lib/beet/recipes/rails/db/mysql.rb",

data/lib/beet/executor.rb

@@ -40,15 +40,15 @@ module Beet
         end
       end
 
-      if @display && options[:template]
-        puts open(TEMPLATE_LOCATIONS[options[:template]]).read
+      if @display && @template
+        puts open(TEMPLATE_LOCATIONS[@template]).read
       else
         case @project_type
         when :rails
           if @generate
             puts "Generating rails project #{project_name}..."
-            if @options[:template]
-              system("rails #{project_name} -m #{TEMPLATE_LOCATIONS[options[:template]]}")
+            if @template
+              system("rails #{project_name} -m #{TEMPLATE_LOCATIONS[@template]}")
             else
               system("rails #{project_name}")
             end

data/lib/beet/file_system.rb

@@ -88,7 +88,8 @@ module Beet
     #   gsub_file 'app/controllers/application_controller.rb', /#\s*(filter_parameter_logging :password)/, '\1'
     #
     def gsub_file(relative_destination, regexp, *args, &block)
-      path = destination_path(relative_destination)
+      #path = destination_path(relative_destination)
+      path = relative_destination
       content = File.read(path)
       check_for = args.first || yield('')
       regex = Regexp.new(regexp.source + Regexp.escape(check_for))
@@ -115,11 +116,23 @@ module Beet
     #    add_after 'config/environment.rb', '# config.gem "aws-s3", :lib => "aws/s3"'
     #
     def add_after(filename, matching_text, data=nil, &block)
-      gsub_file filename, /(#{Regexp.escape(matching_text)})/mi do |match|
+      gsub_file filename, /(\s*#{Regexp.escape(matching_text)})/mi do |match|
         "#{match}\n#{data || block.call}"
       end
     end
 
+    # Add text before matching line
+    #
+    # ==== Example
+    #
+    #    add_before 'config/environment.rb', '# config.gem "aws-s3", :lib => "aws/s3"'
+    #
+    def add_before(filename, matching_text, data=nil, &block)
+      gsub_file filename, /^(\s*#{Regexp.escape(matching_text)})/mi do |match|
+        "#{data || block.call}#{match}"
+      end
+    end
+
     protected
 
     def destination_path(relative_destination)

data/lib/beet/interaction.rb

@@ -8,7 +8,8 @@ module Beet
     #   freeze! if ask("Should I freeze the latest Rails?") == "yes"
     #
     def ask(string)
-      log '', string
+      log '', string 
+      print '> '
       STDIN.gets.strip
     end
 

data/lib/beet/recipes/rails/cms/bcms_blog.rb

@@ -0,0 +1,21 @@
+# install the gem
+if `gem list bcms_blog | grep bcms_blog`.empty?
+  # Run this inside or outside your bcms_blog directory, otherwise download the code
+  git "clone git://github.com/browsermedia/bcms_blog.git" unless File.exists?('./bcms_blog') || File.basename(Dir.pwd) == 'bcms_blog'
+  FileUtils.chdir 'bcms_blog' do
+    system "gem build *.gemspec"
+    sudo "gem install bcms_blog*.gem"
+  end
+  if yes? "Should I delete bcms_blog/"
+    FileUtils.rm_rf('bcms_blog')
+  end
+end
+
+# add to project
+add_after 'config/environment.rb', "config.gem 'browsercms'" do
+  "\tconfig.gem 'bcms_blog'"
+end
+
+add_before 'config/routes.rb', 'map.routes_for_browser_cms' do
+  "\tmap.routes_for_bcms_blog"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jackdempsey-beet
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Jack Dempsey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-06 00:00:00 -07:00
+date: 2009-06-07 00:00:00 -07:00
 default_executable: beet
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,7 @@ files:
 - lib/beet/recipes/rack/middleware.rb
 - lib/beet/recipes/rails/authlogic.rb
 - lib/beet/recipes/rails/clean_files.rb
+- lib/beet/recipes/rails/cms/bcms_blog.rb
 - lib/beet/recipes/rails/css/blueprint.rb
 - lib/beet/recipes/rails/css/reset.rb
 - lib/beet/recipes/rails/db/mysql.rb