penchant 0.2.6 → 0.2.8

data/README.md

@@ -5,6 +5,7 @@ I like to do these things in all my projects:
 * Have all my tests run before committing. I don't like buying ice cream for the team on test failures.
 * If I'm developing gems alongside this project, I use a `Gemfile.penchant` to get around the "one gem, one source" issue in
   current versions of Bundler.
+* I can also factor out and simplify a lot of my Gemfile settings.
 * If I'm moving to different machines or (heaven forbid!) having other developers work on the project, I want to make
   getting all those local gems as easy as possible.
 
@@ -24,6 +25,7 @@ Installs a bunch of scripts into the `scripts` directory of your project:
 Yeah, it's a `Gemfile` with some extras:
 
 ``` ruby
+# Gemfile.penchant
 source :rubygems
 
 gem 'rails', '3.2.3'
@@ -48,7 +50,7 @@ no_deployment do
       #
       # gem 'flowerbox', :path => '../flowerbox', :require => nil
       # gem 'guard-flowerbox', :path => '../guard-flowerbox', :require => nil
-      gems dev_gems, :path => '../%s'
+      gems dev_gems, :path => '../%s' # the %s is the name of the gem
     end
 
     env :remote do
@@ -103,6 +105,29 @@ end
 Run `penchant gemfile ENV --deployment` to get this behavior. This is run by default when the
 pre-commit git hook runs, but only after the default Rake task passes.
 
+#### Won't this change the project dependencies?!
+
+Probably not. You probably have the "main" gems in your project locked to a version of Rails or
+Sinatra or something else, and all of the other gems for authentication, queue processing, etc. are
+dependent on that framework. Ripping out your testing framework and deployment helpers really
+shouldn't be changing the main versions of your application gems. It WORKSFORME and YMMV.
+
+### Getting local gems all set up
+
+`penchant bootstrap` will go through and find all git repo references in your `Gemfile.penchant` and
+will download them to the specified directory (by default, '..'). This means blocks like this
+will work as expected when you `penchant bootstrap` and then `penchant gemfile local`:
+
+``` ruby
+env :local do
+  gem 'my-gem', :path => '../%s'
+end
+
+env :remote do
+  gem 'my-gem', :git => 'git://github.com/johnbintz/%s.git'
+end
+```
+
 ## initialize-environment
 
 Get new developers up to speed fast! `script/initialize-environment` does the following when run:
@@ -135,7 +160,7 @@ to your commit if they've changed.
 
 ### Skipping all that Rake falderal?
 
-Do it Travis CI style: stick `[ci skip]` in your commit message. That's why the meat of hte git hooks resides in
+Do it Travis CI style: stick `[ci skip]` in your commit message. That's why the meat of the git hooks resides in
 `commit-msg` and not `pre-commit`: you need the commit message before you can determine if the tests should be run
 based on the commit message. Weird, I know.
 

data/features/ruby_gemfile.feature

@@ -182,6 +182,18 @@ Feature: Gemfiles
     Then I should get the following repositories:
       | git://github.cats/two.git |
 
+  Scenario: Get the list of git repos defined, regardless of environment
+    Given I have the file "Gemfile.penchant" with the content:
+      """
+      gem 'one', :path => '../%s'
+      env :remote do
+        gem 'two', :git => 'git://github.cats/%s.git'
+      end
+      """
+    When I request the list of git repositories
+    Then I should get the following repositories:
+      | git://github.cats/two.git |
+
   Scenario: Propose defaults for a gem
     Given I have the file "Gemfile.penchant" with the content:
       """
@@ -195,7 +207,6 @@ Feature: Gemfiles
       gem "one", "1.2.3", {:path=>"../one"}
       """
 
-  @wip
   Scenario: Propose defaults for an array of gems
     Given I have the file "Gemfile.penchant" with the content:
       """
@@ -208,3 +219,18 @@ Feature: Gemfiles
       # generated by penchant, environment: local
       gem "one", "1.2.3", {:path=>"../one"}
       """
+
+  Scenario: Propose defaults for an environment
+    Given I have the file "Gemfile.penchant" with the content:
+      """
+      defaults_for env(:local), :path => '../%s'
+      env :local do
+        gem 'one', '1.2.3'
+      end
+      """
+    When I rebuild the Gemfile for "local" mode
+    Then the file "Gemfile" should have the following content:
+      """
+      # generated by penchant, environment: local
+      gem "one", "1.2.3", {:path=>"../one"}
+      """

data/lib/penchant/gemfile.rb

@@ -83,9 +83,27 @@ module Penchant
       gemfile_header['deployment mode'] != nil
     end
 
+    class Env
+      attr_accessor :name
+
+      def initialize(name)
+        @name = name.to_s
+      end
+
+      def ==(other)
+        @name == other.name
+      end
+
+      def to_s
+        "@#{name}"
+      end
+    end
+
     class FileProcessor
       attr_reader :environment, :is_deployment, :available_environments, :defined_git_repos
 
+      ANY_ENVIRONMENT = :any_environment
+
       def self.result(data, *args)
         new(data).result(*args)
       end
@@ -103,6 +121,8 @@ module Penchant
         @available_environments = []
         @defined_git_repos = []
         @defaults = {}
+
+        @_current_env_defaults = {}
       end
 
       def result(_env, _is_deployment)
@@ -119,7 +139,19 @@ module Penchant
       def env(*args)
         @available_environments += args
 
-        yield if args.include?(environment)
+        if block_given?
+          if for_environment?(args)
+            @_current_env_defaults = _defaults_for(Env.new(environment))
+            yield
+            @_current_env_defaults = {}
+          end
+        else
+          Penchant::Gemfile::Env.new(args.shift)
+        end
+      end
+
+      def for_environment?(envs)
+        envs.include?(environment) || environment == ANY_ENVIRONMENT
       end
 
       def no_deployment
@@ -170,7 +202,8 @@ module Penchant
       end
 
       def _defaults_for(gem_name)
-        @defaults[gem_name.to_s] || {}
+        result = @_current_env_defaults
+        result.merge(@defaults[gem_name.to_s] || {})
       end
 
       def current_os
@@ -303,7 +336,7 @@ module Penchant
     end
 
     def defined_git_repos
-      process
+      process(FileProcessor::ANY_ENVIRONMENT)
       builder.defined_git_repos
     end
 
@@ -342,8 +375,8 @@ module Penchant
       File.join(@path, file)
     end
 
-    def process
-      builder.result(@env, @is_deployment)
+    def process(env = @env)
+      builder.result(env, @is_deployment)
     end
 
     def builder

data/lib/penchant/version.rb

@@ -1,3 +1,3 @@
 module Penchant
-  VERSION = "0.2.6"
+  VERSION = "0.2.8"
 end

data/penchant.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_dependency 'bundler'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penchant
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
-dependencies: []
+date: 2012-06-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Things I do for my Rails projects to get up to speed in new environments
   fast
 email:
@@ -81,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3133166305662926927
+      hash: 4263770194857896104
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3133166305662926927
+      hash: 4263770194857896104
 requirements: []
 rubyforge_project: penchant
 rubygems_version: 1.8.23