penchant 0.2.2 → 0.2.3

data/bin/penchant

@@ -63,6 +63,22 @@ class PenchantCLI < Thor
     puts get_current_env
   end
 
+  desc "bootstrap [DIR = ..]", "Download all referred-to git repos to the specified directory"
+  def bootstrap(dir = '..')
+    Penchant::Gemfile.defined_git_repos.each do |repo|
+      puts "Cloning #{repo} to #{dir}."
+      repo.clone_to(dir)
+    end
+  end
+
+  def method_missing(method, *args)
+    if Penchant::Gemfile.available_environments.include?(method)
+      gemfile(method, *args)
+    else
+      super(method, *args)
+    end
+  end
+
   no_tasks do
     def get_current_env
       gemfile = Penchant::Gemfile.new

data/features/gemfile.feature

@@ -32,6 +32,19 @@ Feature: Gemfiles
       this is content
       """
 
+  Scenario: Simple env
+    Given I have the file "Gemfile.erb" with the content:
+      """
+      <% env :local do %>
+        gem 'test'
+      <% end %>
+      """
+    When I rebuild the Gemfile for "local" mode
+    Then the file "Gemfile" should have the following stripped content:
+      """
+      # generated by penchant, environment: local
+      gem 'test'
+      """
   Scenario: Use placeholder expansion
     Given I have the file "Gemfile.erb" with the content:
       """
@@ -40,10 +53,11 @@ Feature: Gemfiles
       <% end %>
       """
     When I rebuild the Gemfile for "local" mode
+
     Then the file "Gemfile" should have the following stripped content:
       """
       # generated by penchant, environment: local
-      gem 'test', :path => %{../test}
+      gem 'test', {:path=>"../test"}
       """
 
   Scenario: Use a gem list for an operation
@@ -59,7 +73,7 @@ Feature: Gemfiles
     Then the file "Gemfile" should have the following stripped content:
       """
       # generated by penchant, environment: local
-      gem 'test', :path => %{../test}
+      gem 'test', {:path=>"../test"}
       """
   
   Scenario: Let gem get additional info

data/features/ruby_gemfile.feature

@@ -1,10 +1,13 @@
 @fakefs
 Feature: Gemfiles
+  @wip
   Scenario: Process a pure Ruby gemfile
     Given I have the file "Gemfile.penchant" with the content:
       """
       source :rubygems
 
+      gemspec
+
       group :cats, :dogs do
         case environment
         when :local
@@ -19,6 +22,7 @@ Feature: Gemfiles
       """
       # generated by penchant, environment: local
       source :rubygems
+      gemspec
 
       group :cats, :dogs do
         gem "test", {:path=>"../test"}
@@ -29,6 +33,7 @@ Feature: Gemfiles
       """
       # generated by penchant, environment: remote
       source :rubygems
+      gemspec
 
       group :cats, :dogs do
         gem "test", {:git=>"git://github.com/johnbintz/test.git"}
@@ -129,7 +134,7 @@ Feature: Gemfiles
       gem "one", {:path=>"../one"}
       """
 
-  @wip @mocha
+  @mocha
   Scenario: OS-specific blocks
     Given I have the file "Gemfile.penchant" with the content:
       """
@@ -152,3 +157,29 @@ Feature: Gemfiles
 
       """
 
+  Scenario: Get the list of environments defined
+    Given I have the file "Gemfile.penchant" with the content:
+      """
+      env :cat do
+        gem 'one', :path => '../%s'
+      end
+
+      env :dog do
+        gem 'two', :path => '../%s'
+      end
+      """
+    When I request the list of environments available
+    Then I should get the following environments:
+      | cat |
+      | dog |
+
+  Scenario: Get the list of git repos defined
+    Given I have the file "Gemfile.penchant" with the content:
+      """
+      gem 'one', :path => '../%s'
+      gem 'two', :git => 'git://github.cats/%s.git'
+      """
+    When I request the list of git repositories
+    Then I should get the following repositories:
+      | git://github.cats/two.git |
+

data/features/step_definitions/then/i_should_get_the_following_environments.rb

@@ -0,0 +1,3 @@
+Then /^I should get the following environments:$/ do |table|
+  @environments.collect(&:to_s).sort.should == table.raw.flatten.sort
+end

data/features/step_definitions/then/i_should_get_the_following_repositories.rb

@@ -0,0 +1,4 @@
+Then /^I should get the following repositories:$/ do |table|
+  @repos.collect(&:to_s).sort.should == table.raw.flatten.sort
+end
+

data/features/step_definitions/when/i_request_the_list_of_environments_available.rb

@@ -0,0 +1,3 @@
+When /^I request the list of environments available$/ do
+  @environments = Penchant::Gemfile.available_environments
+end

data/features/step_definitions/when/i_request_the_list_of_git_repositories.rb

@@ -0,0 +1,3 @@
+When /^I request the list of git repositories$/ do
+  @repos = Penchant::Gemfile.defined_git_repos
+end

data/lib/penchant/gemfile.rb

@@ -17,17 +17,26 @@ module Penchant
     end
 
     def self.pre_switch(env, deployment = false)
-      gemfile = Penchant::Gemfile.new
+      gemfile = new
       return false if !gemfile.has_processable_gemfile?
       gemfile.run_dot_penchant!(env, deployment)
 
       gemfile
     end
 
+    def self.available_environments
+      new.available_environments
+    end
+
+    def self.defined_git_repos
+      new.defined_git_repos
+    end
+
     def current_env ; @env ; end
 
     def initialize(path = Dir.pwd)
       @path = path
+      @env = environment
     end
 
     def gemfile_path
@@ -75,7 +84,7 @@ module Penchant
     end
 
     class FileProcessor
-      attr_reader :environment, :is_deployment
+      attr_reader :environment, :is_deployment, :available_environments, :defined_git_repos
 
       def self.result(data, *args)
         new(data).result(*args)
@@ -91,6 +100,8 @@ module Penchant
 
       def initialize(data)
         @data = data
+        @available_environments = []
+        @defined_git_repos = []
       end
 
       def result(_env, _is_deployment)
@@ -105,6 +116,8 @@ module Penchant
       end
 
       def env(*args)
+        @available_environments += args
+
         yield if args.include?(environment)
       end
 
@@ -168,14 +181,20 @@ module Penchant
       end
 
       def env(check, template = {}, &block)
-        if check.to_s == @env.to_s
+        if check.to_s == @environment.to_s
           original_erbout = @_erbout.dup
 
           output = instance_eval(&block).lines.to_a
 
           output.each do |line|
             if gem_name = line[%r{gem ['"]([^'"]+)['"]}, 1]
-              line.replace(line.rstrip + process_options(gem_name, template) + "\n")
+              new_line = line.rstrip
+
+              if !(options = process_options(gem_name, template)).empty?
+                new_line += ", #{options.inspect}"
+              end
+
+              line.replace(new_line + "\n")
             end
           end
 
@@ -220,9 +239,17 @@ module Penchant
         args = [ gem_name.first ]
         args << options if !options.empty?
 
+        if options[:git]
+          @defined_git_repos << Penchant::Repo.new(options[:git])
+        end
+
         @output << %{gem #{args_to_string(args)}}
       end
 
+      def gemspec
+        @output << %{gemspec}
+      end
+
       def gems(*args)
         gems, template = split_args(args)
 
@@ -250,10 +277,20 @@ module Penchant
       end
     end
 
+    def available_environments
+      process
+      builder.available_environments
+    end
+
+    def defined_git_repos
+      process
+      builder.defined_git_repos
+    end
+
     def switch_to!(gemfile_env = nil, deployment = false)
       @env, @is_deployment = gemfile_env, deployment
 
-      output = [ header, process(template) ]
+      output = [ header, process ]
 
       File.open(gemfile_path, 'wb') { |fh| fh.print output.join("\n") }
     end
@@ -285,15 +322,21 @@ module Penchant
       File.join(@path, file)
     end
 
-    def process(template)
-      builder = case File.extname(processable_gemfile_path)
+    def process
+      builder.result(@env, @is_deployment)
+    end
+
+    def builder
+      return @builder if @builder
+
+      klass = case File.extname(processable_gemfile_path)
       when '.penchant'
         PenchantFile
       when '.erb'
         ERBFile
       end
 
-      builder.result(template, @env, @is_deployment)
+      @builder = klass.new(template)
     end
 
     def template

data/lib/penchant/repo.rb

@@ -0,0 +1,16 @@
+module Penchant
+  class Repo
+    def initialize(url)
+      @url = url
+    end
+
+    def clone_to(dir)
+      Dir.chdir(dir) do
+        system %{git clone #{@url}}
+      end
+    end
+
+    def to_s ; @url ; end
+  end
+end
+

data/lib/penchant/version.rb

@@ -1,3 +1,3 @@
 module Penchant
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/penchant.rb

@@ -1,4 +1,5 @@
 module Penchant
   autoload :Gemfile, 'penchant/gemfile'
+  autoload :Repo, 'penchant/repo'
   autoload :DotPenchant, 'penchant/dot_penchant'
 end

data/spec/lib/penchant/gemfile_spec.rb

@@ -150,7 +150,7 @@ ERB
   end
 
   describe '#switch_to!' do
-    let(:template) { 'template' }
+    let(:template) { 'source' }
     let(:gemfile_path) { 'gemfile path' }
     let(:header) { 'header' }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penchant
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies: []
 description: Things I do for my Rails projects to get up to speed in new environments
   fast
@@ -32,18 +32,23 @@ files:
 - features/ruby_gemfile.feature
 - features/step_definitions/given/i_am_on_the_linux_platform.rb
 - features/step_definitions/given/i_have_the_file_with_content.rb
+- features/step_definitions/then/i_should_get_the_following_environments.rb
+- features/step_definitions/then/i_should_get_the_following_repositories.rb
 - features/step_definitions/then/the_file_gemfile_should_have_the_following_stripped_content.rb
 - features/step_definitions/then/the_file_should_have_content.rb
 - features/step_definitions/then/the_output_should_include.rb
 - features/step_definitions/when/i_rebuild_the_gemfile_for_local_mode.rb
 - features/step_definitions/when/i_rebuild_the_gemfile_switching_back.rb
 - features/step_definitions/when/i_rebuild_the_gemfile_with_deployment.rb
+- features/step_definitions/when/i_request_the_list_of_environments_available.rb
+- features/step_definitions/when/i_request_the_list_of_git_repositories.rb
 - features/step_definitions/when/i_run_in.rb
 - features/support/cuke-pack.rb
 - features/support/env.rb
 - lib/penchant.rb
 - lib/penchant/dot_penchant.rb
 - lib/penchant/gemfile.rb
+- lib/penchant/repo.rb
 - lib/penchant/version.rb
 - penchant.gemspec
 - script/gemfile
@@ -93,12 +98,16 @@ test_files:
 - features/ruby_gemfile.feature
 - features/step_definitions/given/i_am_on_the_linux_platform.rb
 - features/step_definitions/given/i_have_the_file_with_content.rb
+- features/step_definitions/then/i_should_get_the_following_environments.rb
+- features/step_definitions/then/i_should_get_the_following_repositories.rb
 - features/step_definitions/then/the_file_gemfile_should_have_the_following_stripped_content.rb
 - features/step_definitions/then/the_file_should_have_content.rb
 - features/step_definitions/then/the_output_should_include.rb
 - features/step_definitions/when/i_rebuild_the_gemfile_for_local_mode.rb
 - features/step_definitions/when/i_rebuild_the_gemfile_switching_back.rb
 - features/step_definitions/when/i_rebuild_the_gemfile_with_deployment.rb
+- features/step_definitions/when/i_request_the_list_of_environments_available.rb
+- features/step_definitions/when/i_request_the_list_of_git_repositories.rb
 - features/step_definitions/when/i_run_in.rb
 - features/support/cuke-pack.rb
 - features/support/env.rb