penchant 0.2.11 → 0.2.12

data/README.md

@@ -37,6 +37,14 @@ gem 'rails', '3.2.3'
 # gem 'rack-rewrite'
 gems 'rake', 'nokogiri', 'rack-rewrite'
 
+# define custom gem properties that get expanded to ones bundler understands
+property :github, :git => 'git://github.com/$1/%s.git'
+  # values to the key are [ value ].flatten-ed and the $s are replaced on the fly,
+  # with $1 being the first parameter given
+
+# set up defaults for all gems in a particular environment
+defaults_for env(:local), :path => '../%s' # the %s is the name of the gem
+
 no_deployment do
   group :development, :test do
     gem 'rspec', '~> 2.6.0'
@@ -46,9 +54,6 @@ no_deployment do
     # set up defaults for certain gems that are probably being used in envs
     defaults_for dev_gems, :require => nil
 
-    # set up defaults for all gems in a particular environment
-    defaults_for env(:local), :path => '../%s' # the %s is the name of the gem
-
     env :local do
       # expands to:
       #
@@ -62,7 +67,7 @@ no_deployment do
       #
       # gem 'flowerbox', :git => 'git://github.com/johnbintz/flowerbox.git', :require => nil
       # gem 'guard-flowerbox', :git => 'git://github.com/johnbintz/guard-flowerbox.git', :require => nil
-      gems dev_gems, :git => 'git://github.com/johnbintz/%s.git'
+      gems dev_gems, :github => 'johnbintz'
     end
 
     # only expanded on Mac OS X
@@ -122,7 +127,7 @@ shouldn't be changing the main versions of your application gems. It WORKSFORME
 ### 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 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

data/bin/penchant

@@ -9,25 +9,32 @@ class PenchantCLI < Thor
   include Thor::Actions
   source_root File.expand_path('../..', __FILE__)
 
+  SCRIPT_DIR = 'script'
+  CLONE_DIR = '..'
+
   desc "install", "Copy the common scripts to the project"
-  method_options :dir => 'script'
+  method_options :dir => SCRIPT_DIR
   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}"
+    if File.directory?('.git')
+      Dir['script/hooks/*'].each do |hook|
+        FileUtils.ln_sf File.join(Dir.pwd, hook), ".git/hooks/#{File.split(hook).last}"
+      end
+    else
+      puts "No git repository detected here. Skipping git hook installation..."
     end
   end
 
   desc "update", "Update the installed scripts"
-  method_options :dir => 'script'
+  method_options :dir => SCRIPT_DIR
   def update
     install
   end
 
   desc "convert", "Make an existing project Penchant-isized"
-  method_options :dir => 'script'
+  method_options :dir => SCRIPT_DIR
   def convert
     install
     FileUtils.mv 'Gemfile', 'Gemfile.penchant'
@@ -63,10 +70,10 @@ class PenchantCLI < Thor
     puts get_current_env
   end
 
-  desc "bootstrap [DIR = ..]", "Download all referred-to git repos to the specified directory"
-  def bootstrap(dir = '..')
+  desc "bootstrap [DIR = #{CLONE_DIR}]", "Download all referred-to git repos to the specified directory"
+  def bootstrap(dir = CLONE_DIR)
     Penchant::Gemfile.defined_git_repos.each do |repo|
-      puts "Cloning #{repo} to #{dir}."
+      puts "Cloning #{repo} to #{dir}"
       repo.clone_to(dir)
     end
   end

data/features/cli.feature

@@ -16,3 +16,15 @@ Feature: CLI
       """
       And the output should include "fallback: other"
 
+  Scenario: Try to convert a project, ignoring git hooks
+    Given I have the file "tmp/Gemfile" with the content:
+      """
+      source :rubygems
+      """
+    When I run "bin/penchant convert" in the "tmp" directory
+    Then the file "tmp/Gemfile.penchant" should have the following content:
+      """
+      source :rubygems
+      """
+      And the output should include "No git"
+    

data/features/support/env.rb

@@ -2,7 +2,7 @@ require 'fakefs/safe'
 require 'penchant'
 require 'mocha'
 
-World(Mocha::Standalone)
+World(Mocha::API)
 
 Before('@fakefs') do
   FakeFS.activate!

data/lib/penchant/version.rb

@@ -1,3 +1,3 @@
 module Penchant
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penchant
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3735889517013965270
+      hash: 1854452012171480691
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,10 +202,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3735889517013965270
+      hash: 1854452012171480691
 requirements: []
 rubyforge_project: penchant
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Things I do for my Rails projects to get up to speed in new environments