penchant 0.0.3 → 0.0.5

data/README.md

@@ -31,6 +31,10 @@ Yeah, it's a `Gemfile` with ERB in it:
 <% env :remote do %>
   gem 'guard', :git => 'git://github.com/johnbintz/guard.git'
 <% end %>
+
+<% no_deployment do %>
+  gem 'os-specific-things'
+<% end %>
 ```
 
 Use `script/gemfile local` to get at the local ones, and `script/gemfile remote` to get at the remote ones.
@@ -38,6 +42,29 @@ It then runs `bundle install`.
 
 You can also run `penchant gemfile ENV`.
 
+### Deployment mode
+
+Use `no_deployment` blocks to indicate gems that shouldn't even appear in `Gemfiles` destined for
+remote servers. *Very* helpful when you have OS-specific gems and are developing on one platform
+and deploying on another:
+
+``` erb
+<% no_deployment do %>
+  require 'rbconfig'
+  case RbConfig::CONFIG['host_os']
+  when /darwin/
+    gem 'growl_notify'
+    gem 'growl'
+    gem 'rb-fsevent'
+  when /linux/
+    gem 'libnotify', :require => nil
+  end
+<% end %>
+```
+
+Run `penchant gemfile ENV --deployment` to get this behavior. This is run by default when the
+pre-commit git hook runs.
+
 ## initialize-environment
 
 Get new developers up to speed fast! `script/initialize-environment` does the following when run:

data/bin/penchant

@@ -14,6 +14,10 @@ class PenchantCLI < Thor
   def install
     directory 'template/script', options[:dir]
     Dir[File.join(options[:dir], '**/*')].each { |file| File.chmod(0755, file) }
+
+    Dir['script/hooks/*'].each do |hook|
+      FileUtils.ln_sf File.join(Dir.pwd, hook), ".git/hooks/#{File.split(hook).last}"
+    end
   end
 
   desc "convert", "Make an existing project Penchant-isized"
@@ -24,11 +28,12 @@ class PenchantCLI < Thor
     gemfile(:remote)
   end
 
+  method_options :deployment => false
   desc "gemfile ENV", "Switch the gemfile environment, or rebuild the current environment if not given"
   def gemfile(env = get_current_env)
     if env
-      puts "[penchant] Rebunding for #{env} environment..."
-      Penchant::Gemfile.do_full_env_switch!(env)
+      puts "[penchant] Rebunding for #{env} environment#{options[:deployment] ? ", deployment mode" : ''}..."
+      Penchant::Gemfile.do_full_env_switch!(env, options[:deployment])
     end
 
     gemfile = Penchant::Gemfile.new
@@ -47,7 +52,9 @@ class PenchantCLI < Thor
   no_tasks do
     def get_current_env
       gemfile = Penchant::Gemfile.new
-      gemfile.environment
+      out = [ gemfile.environment ]
+      out << "deployment" if gemfile.deployment?
+      out.join(' ')
     end
   end
 

data/lib/penchant/dot_penchant.rb

@@ -1,14 +1,14 @@
 module Penchant
   class DotPenchant
     class << self
-      def run(env = nil)
+      def run(env = nil, deployment = false)
         dot_penchant = new
         dot_penchant.run(env)
         dot_penchant
       end
     end
 
-    def run(env = nil)
+    def run(env = nil, deployment = false)
       instance_eval(File.read('.penchant'))
     end
 
@@ -22,7 +22,6 @@ module Penchant
     def gemfile?
       File.file?('Gemfile')
     end
-
   end
 end
 

data/lib/penchant/gemfile.rb

@@ -5,15 +5,15 @@ module Penchant
     attr_reader :path
 
     class << self
-      def do_full_env_switch!(env)
+      def do_full_env_switch!(env, deployment = false)
         gemfile = Penchant::Gemfile.new
-        gemfile.run_dot_penchant!(env)
+        gemfile.run_dot_penchant!(env, deployment)
 
         if !gemfile.has_gemfile_erb?
           return false
         end
 
-        gemfile.switch_to!(env)
+        gemfile.switch_to!(env, deployment)
       end
     end
 
@@ -42,22 +42,26 @@ module Penchant
     end
 
     def environment
-      File.readlines(gemfile_path).first.strip[%r{environment: (.*)}, 1]
+      File.readlines(gemfile_path).first.strip[%r{environment: ([^, ]*)}, 1]
     end
 
-    def switch_to!(gemfile_env = nil)
-      @env = gemfile_env
+    def deployment?
+      File.readlines(gemfile_path).first['deployment mode'] != nil
+    end
+
+    def switch_to!(gemfile_env = nil, deployment = false)
+      @env, @is_deployment = gemfile_env, deployment
       template = File.read(gemfile_erb_path)
 
       File.open(gemfile_path, 'wb') do |fh|
-        fh.puts "# generated by penchant, environment: #{@env}"
+        fh.puts "# generated by penchant, environment: #{@env || "none"}#{@is_deployment ? " , deployment mode" : ""}"
 
         fh.print ERB.new(template).result(binding)
       end
     end
 
-    def run_dot_penchant!(env)
-      DotPenchant.run(env || environment) if has_dot_penchant?
+    def run_dot_penchant!(env, deployment)
+      DotPenchant.run(env || environment, deployment) if has_dot_penchant?
     end
 
     private
@@ -68,6 +72,10 @@ module Penchant
     def env(check, &block)
       instance_eval(&block) if check.to_s == @env.to_s
     end
+
+    def no_deployment(&block)
+      instance_eval(&block) if !@is_deployment
+    end
   end
 end
 

data/lib/penchant/version.rb

@@ -1,3 +1,3 @@
 module Penchant
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/script/hooks/pre-commit

@@ -4,7 +4,7 @@ OLD_GIT_DIR=$GIT_DIR
 
 if [ "$(penchant gemfile-env)" != "remote" ]; then
   unset GIT_DIR
-  penchant gemfile remote
+  penchant gemfile remote --deployment
   GIT_DIR=$OLD_GIT_DIR
   git add Gemfile*
 fi

data/spec/lib/penchant/gemfile_spec.rb

@@ -47,6 +47,17 @@ describe Penchant::Gemfile do
 GEMFILE
 
         its(:environment) { should == environment }
+        it { should_not be_deployment }
+      end
+
+      context 'deployment' do
+        let(:environment) { 'test' }
+        let(:data) { <<-GEMFILE }
+# generated by penchant, environment: #{environment}, deployment mode
+GEMFILE
+
+        its(:environment) { should == environment }
+        it { should be_deployment }
       end
     end
 
@@ -77,6 +88,10 @@ GEMFILE
   not
 <% end %>
 
+<% no_deployment do %>
+  diddeploy
+<% end %>
+
 all
 ERB
 
@@ -84,6 +99,7 @@ ERB
         subject.switch_to!(:test)
 
         File.read('Gemfile').should include('test')
+        File.read('Gemfile').should include('diddeploy')
         File.read('Gemfile').should_not include('not')
         File.read('Gemfile').should include('all')
       end
@@ -92,6 +108,7 @@ ERB
         subject.switch_to!(:not)
 
         File.read('Gemfile').should_not include('test')
+        File.read('Gemfile').should include('diddeploy')
         File.read('Gemfile').should include('not')
         File.read('Gemfile').should include('all')
       end
@@ -101,6 +118,16 @@ ERB
 
         File.read('Gemfile').should_not include('test')
         File.read('Gemfile').should_not include('not')
+        File.read('Gemfile').should include('diddeploy')
+        File.read('Gemfile').should include('all')
+      end
+
+      it 'should skip no_deployment sections' do
+        subject.switch_to!(nil, true)
+
+        File.read('Gemfile').should_not include('test')
+        File.read('Gemfile').should_not include('not')
+        File.read('Gemfile').should_not include('diddeploy')
         File.read('Gemfile').should include('all')
       end
 

data/template/script/hooks/post-commit

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+penchant gemfile remote
+

data/template/script/hooks/pre-commit

@@ -2,9 +2,9 @@
 
 OLD_GIT_DIR=$GIT_DIR
 
-if [ "$(penchant gemfile-env)" != "remote" ]; then
+if [ "$(penchant gemfile-env)" != "remote deployment" ]; then
   unset GIT_DIR
-  penchant gemfile remote
+  penchant gemfile remote --deployment
   GIT_DIR=$OLD_GIT_DIR
   git add Gemfile*
 fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penchant
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-14 00:00:00.000000000Z
+date: 2011-10-13 00:00:00.000000000Z
 dependencies: []
 description: Things I do for my Rails projects to get up to speed in new environments
   fast
@@ -40,6 +40,7 @@ files:
 - spec/lib/penchant_spec.rb
 - spec/spec_helper.rb
 - template/script/gemfile
+- template/script/hooks/post-commit
 - template/script/hooks/pre-commit
 - template/script/initialize-environment
 - template/script/install-git-hooks
@@ -63,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: penchant
-rubygems_version: 1.8.9
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Things I do for my Rails projects to get up to speed in new environments