penchant 0.2.24 → 0.2.26

data/lib/penchant/hooks.rb

@@ -12,12 +12,9 @@ module Penchant
           return false if !File.symlink?(target)
           return false if !File.expand_path(File.readlink(target)) == File.expand_path(file)
         end
-
-        true
-      else
-        # no script/hooks dir, so we must not want them
-        true
       end
+
+      true
     end
 
     def self.install!

data/lib/penchant/property_stack.rb

@@ -0,0 +1,28 @@
+module Penchant
+  class PropertyStack
+    PATHING_OPTIONS = [ :git, :branch, :path ].freeze
+
+    def initialize(builder, property_stack, strip_pathing_options)
+      @builder, @property_stack, @strip_pathing_options = builder, property_stack.dup, strip_pathing_options
+    end
+
+    def processor
+      @processor ||= PropertyStackProcessor.new(@builder)
+    end
+
+    def process_for_gem(gem_name, additional_env = {})
+      properties = processor.process(gem_name, @property_stack)
+
+      if @strip_pathing_options
+        PATHING_OPTIONS.each { |key| properties.delete(key) }
+      end
+
+      properties = processor.process(gem_name, @builder.defaults[gem_name].merge(additional_env)).merge(properties)
+
+      properties.delete(:opposite)
+
+      Hash[properties.sort]
+    end
+  end
+end
+

data/lib/penchant/property_stack_builder.rb

@@ -0,0 +1,24 @@
+module Penchant
+  class PropertyStackBuilder
+    attr_reader :defaults
+
+    def initialize(defaults)
+      @defaults = defaults
+
+      @custom_properties = {}
+    end
+
+    def []=(key, value)
+      @custom_properties[key] = CustomProperty.new(value)
+    end
+
+    def [](key)
+      @custom_properties[key]
+    end
+
+    def create_stack_for(stack, strip_pathing_options = false)
+      PropertyStack.new(self, stack, strip_pathing_options)
+    end
+  end
+end
+

data/lib/penchant/property_stack_processor.rb

@@ -0,0 +1,26 @@
+module Penchant
+  class PropertyStackProcessor
+    def initialize(builder)
+      @builder = builder
+    end
+
+    def process(gem_name, stack)
+      properties = {}
+      property_stack = stack.dup.to_a
+
+      while !property_stack.empty?
+        key, value = property_stack.shift
+
+        if property = @builder[key]
+          property_stack += property.process([ value ].flatten)
+        else
+          value = value % gem_name if value.respond_to?(:%)
+
+          properties[key] = value
+        end
+      end
+
+      properties
+    end
+  end
+end

data/lib/penchant/version.rb

@@ -1,3 +1,3 @@
 module Penchant
-  VERSION = "0.2.24"
+  VERSION = "0.2.26"
 end

data/lib/penchant.rb

@@ -3,4 +3,11 @@ module Penchant
   autoload :Repo, 'penchant/repo'
   autoload :DotPenchant, 'penchant/dot_penchant'
   autoload :Hooks, 'penchant/hooks'
+  autoload :Env, 'penchant/env'
+  autoload :FileProcessor, 'penchant/file_processor'
+  autoload :Defaults, 'penchant/defaults'
+  autoload :CustomProperty, 'penchant/custom_property'
+  autoload :PropertyStack, 'penchant/property_stack'
+  autoload :PropertyStackBuilder, 'penchant/property_stack_builder'
+  autoload :PropertyStackProcessor, 'penchant/property_stack_processor'
 end

data/script/initialize-environment

@@ -1,23 +1,7 @@
 #!/usr/bin/env ruby
 
-if File.file?('Gemfile.erb')
-  pwd = Dir.pwd
-
-  Dir.chdir '..' do
-    File.readlines(File.join(pwd, 'Gemfile.erb')).find_all { |line| line[':git'] }.each do |line|
-      repo = line[%r{:git => (['"])([^'"]+)\1}, 2]
-
-      puts "Installing #{repo}"
-      system %{git clone #{repo}}
-    end
-  end
-
-  puts "Bundling for local environment"
-  system %{script/gemfile local}
-else
-  puts "Bundling..."
-  system %{bundle}
-end
+puts "Bundling..."
+system %{bundle}
 
 puts "Installing git hooks"
 system %{script/install-git-hooks}

data/template/script/initialize-environment

@@ -1,23 +1,7 @@
 #!/usr/bin/env ruby
 
-if File.file?('Gemfile.erb')
-  pwd = Dir.pwd
-
-  Dir.chdir '..' do
-    File.readlines(File.join(pwd, 'Gemfile.erb')).find_all { |line| line[':git'] }.each do |line|
-      repo = line[%r{:git => (['"])([^'"]+)\1}, 2]
-
-      puts "Installing #{repo}"
-      system %{git clone #{repo}}
-    end
-  end
-
-  puts "Bundling for local environment"
-  system %{script/gemfile local}
-else
-  puts "Bundling..."
-  system %{bundle}
-end
+puts "Bundling..."
+system %{bundle}
 
 puts "Installing git hooks"
 system %{script/install-git-hooks}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penchant
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,7 +140,6 @@ files:
 - bin/penchant
 - config/cucumber.yml
 - features/cli.feature
-- features/gemfile.feature
 - features/ruby_gemfile.feature
 - features/step_definitions/given/i_am_on_the_linux_platform.rb
 - features/step_definitions/given/i_expect_git_hooks_to_be_installed.rb
@@ -163,9 +162,16 @@ files:
 - features/support/cuke-pack.rb
 - features/support/env.rb
 - lib/penchant.rb
+- lib/penchant/custom_property.rb
+- lib/penchant/defaults.rb
 - lib/penchant/dot_penchant.rb
+- lib/penchant/env.rb
+- lib/penchant/file_processor.rb
 - lib/penchant/gemfile.rb
 - lib/penchant/hooks.rb
+- lib/penchant/property_stack.rb
+- lib/penchant/property_stack_builder.rb
+- lib/penchant/property_stack_processor.rb
 - lib/penchant/repo.rb
 - lib/penchant/version.rb
 - penchant.gemspec
@@ -175,10 +181,6 @@ files:
 - script/hooks/pre-commit
 - script/initialize-environment
 - script/install-git-hooks
-- spec/lib/penchant/dot_penchant_spec.rb
-- spec/lib/penchant/gemfile_spec.rb
-- spec/lib/penchant_spec.rb
-- spec/spec_helper.rb
 - template/script/gemfile
 - template/script/hooks/commit-msg
 - template/script/hooks/post-commit
@@ -199,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3136912616894151920
+      hash: -2642462117175779427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3136912616894151920
+      hash: -2642462117175779427
 requirements: []
 rubyforge_project: penchant
 rubygems_version: 1.8.23
@@ -218,7 +220,6 @@ summary: Things I do for my Rails projects to get up to speed in new environment
   fast
 test_files:
 - features/cli.feature
-- features/gemfile.feature
 - features/ruby_gemfile.feature
 - features/step_definitions/given/i_am_on_the_linux_platform.rb
 - features/step_definitions/given/i_expect_git_hooks_to_be_installed.rb
@@ -240,7 +241,3 @@ test_files:
 - features/step_definitions/when/i_run_in.rb
 - features/support/cuke-pack.rb
 - features/support/env.rb
-- spec/lib/penchant/dot_penchant_spec.rb
-- spec/lib/penchant/gemfile_spec.rb
-- spec/lib/penchant_spec.rb
-- spec/spec_helper.rb

data/features/gemfile.feature

@@ -1,123 +0,0 @@
-@fakefs
-Feature: Gemfiles
-  Scenario: When rebuilding for deployment, save the original state
-    Given I have the file "Gemfile.erb" with the content:
-      """
-      this is content
-      """
-      And I have the file "Gemfile" with the content:
-      """
-      # generated by penchant, environment: local
-      """
-    When I rebuild the Gemfile for "production" mode with deployment
-    Then the file "Gemfile" should have the following content:
-      """
-      # generated by penchant, environment: production, deployment mode (was local)
-      this is content
-      """
-
-  Scenario: When unbundling from deployment with an original state, switch to that state
-    Given I have the file "Gemfile.erb" with the content:
-      """
-      this is content
-      """
-      And I have the file "Gemfile" with the content:
-      """
-      # generated by penchant, environment: production, deployment mode (was local)
-      """
-    When I rebuild the Gemfile asking to switch back to the previous state
-    Then the file "Gemfile" should have the following content:
-      """
-      # generated by penchant, environment: local
-      this is content
-      """
-
-  Scenario: Simple env
-    Given I have the file "Gemfile.erb" with the content:
-      """
-      gem 'test'
-      <% 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'
-      gem 'test'
-      """
-
-  Scenario: Use placeholder expansion
-    Given I have the file "Gemfile.erb" with the content:
-      """
-      <% env :local, :path => '../%s' 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', {:path=>"../test"}
-      """
-
-  Scenario: Use a gem list for an operation
-    Given I have the file "Gemfile.erb" with the content:
-      """
-      <% gems 'test' do %>
-        <% env :local, :path => '../%s' do %>
-          <%= gem %>
-        <% end %>
-      <% 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"}
-      """
-  
-  Scenario: Let gem get additional info
-    Given I have the file "Gemfile.erb" with the content:
-      """
-      <% gems 'test' do %>
-        <%= gem :path => '../%s' %>
-      <% end %>
-      """
-    When I rebuild the Gemfile for "local" mode
-    Then the file "Gemfile" should have the following content:
-      """
-      # generated by penchant, environment: local
-
-        gem 'test', {:path=>"../test"}
-
-      """
-  
-  Scenario: Use a gem list without a block
-    Given I have the file "Gemfile.erb" with the content:
-      """
-      <% gems 'test', :path => '../%s' %>
-      """
-    When I rebuild the Gemfile for "local" mode
-    Then the file "Gemfile" should have the following content:
-      """
-      # generated by penchant, environment: local
-      gem 'test', {:path=>"../test"}
-
-      """
-
-  Scenario: Use a gem list with an array
-    Given I have the file "Gemfile.erb" with the content:
-      """
-      <% gems [ 'test' ], :path => '../%s' %>
-      """
-    When I rebuild the Gemfile for "local" mode
-    Then the file "Gemfile" should have the following content:
-      """
-      # generated by penchant, environment: local
-      gem 'test', {:path=>"../test"}
-
-      """
-

data/spec/lib/penchant/dot_penchant_spec.rb

@@ -1,45 +0,0 @@
-require 'spec_helper'
-
-describe Penchant::DotPenchant do
-  include FakeFS::SpecHelpers
-
-  describe '.run' do
-    before do
-      File.open('.penchant', 'wb') { |fh|
-        fh.puts "@did_run = env"
-      }
-    end
-
-    it 'should run the file in the environment' do
-      dot_file = Penchant::DotPenchant.run(:this)
-
-      dot_file.instance_variable_get(:@did_run).should == :this
-    end
-  end
-
-  let(:dot_file) { described_class.new }
-
-  describe '#rake' do
-    context 'without Gemfile' do
-      before do
-        Kernel.expects(:system).with('rake task1 task2')
-      end
-
-      it 'should run the rake task via system' do
-        dot_file.rake("task1", "task2")
-      end
-    end
-
-    context 'with Gemfile' do
-      before do
-        File.open('Gemfile', 'wb')
-        Kernel.expects(:system).with('bundle exec rake task1 task2')
-      end
-
-      it 'should run the rake task via system' do
-        dot_file.rake("task1", "task2")
-      end
-    end
-  end
-end
-

data/spec/lib/penchant/gemfile_spec.rb

@@ -1,296 +0,0 @@
-require 'spec_helper'
-
-describe Penchant::Gemfile do
-  include FakeFS::SpecHelpers
-
-  let(:dir) { File.expand_path(Dir.pwd) }
-  let(:gemfile) { described_class.new(dir) }
-
-  let(:gemfile_path) { File.join(dir, 'Gemfile') }
-  let(:gemfile_erb_path) { File.join(dir, 'Gemfile.erb') }
-
-  def write_file(path, content = nil)
-    FileUtils.mkdir_p(File.dirname(path))
-
-    File.open(path, 'wb') do |fh|
-      content = yield if block_given?
-      fh.print content
-    end
-  end
-
-  subject { gemfile }
-
-  context 'with no gemfile' do
-    it { should_not have_gemfile }
-    it { should_not have_gemfile_erb }
-  end
-
-  context 'with gemfile' do
-    let(:data) { "whatever" }
-
-    before do
-      write_file(gemfile_path) { data }
-    end
-
-    describe 'existence' do
-      it { should have_gemfile }
-      it { should_not have_gemfile_erb }
-    end
-
-    describe '#environment' do
-      context 'not defined' do
-        its(:environment) { should be_nil }
-      end
-
-      context 'defined' do
-        let(:environment) { 'test' }
-        let(:data) { <<-GEMFILE }
-# generated by penchant, environment: #{environment}
-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
-
-    describe '#switch_to!' do
-      it 'should raise an exception' do
-        expect { subject.switch_to!(:whatever) }.to raise_error(Errno::ENOENT)
-      end
-    end
-  end
-
-  context 'with gemfile.erb' do
-    let(:erb_data) { 'whatever' }
-
-    before do
-      write_file(gemfile_erb_path) { erb_data }
-    end
-
-    it { should_not have_gemfile }
-    it { should have_gemfile_erb }
-
-    describe '#switch_to!' do
-      let(:erb_data) { <<-ERB }
-<% env :test do %>
-  test
-<% end %>
-
-<% env :not do %>
-  not
-<% end %>
-
-<% no_deployment do %>
-  diddeploy
-<% end %>
-
-all
-ERB
-
-      it 'should render test data' do
-        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
-
-      it 'should not render test data' do
-        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
-
-      it 'should not render either' do
-        subject.switch_to!
-
-        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
-
-      it { should_not have_dot_penchant }
-
-      context 'with .penchant' do
-        before do
-          File.open('.penchant', 'wb')
-        end
-
-        it { should have_dot_penchant }
-
-        it 'should process the file' do
-          subject.switch_to!(:not)
-        end
-      end
-    end
-  end
-
-  describe '#switch_to!' do
-    let(:template) { 'source' }
-    let(:gemfile_path) { 'gemfile path' }
-    let(:header) { 'header' }
-
-    let(:gemfile_out) { File.read(gemfile_path) }
-
-    before do
-      gemfile.stubs(:template).returns(template)
-      gemfile.stubs(:gemfile_path).returns(gemfile_path)
-
-      gemfile.expects(:header).returns(header)
-    end
-
-    it 'should write out the new gemfile' do
-      gemfile.switch_to!
-
-      gemfile_out.should include(template)
-      gemfile_out.should include(header)
-    end
-  end
-
-  describe '#header' do
-    subject { gemfile.header }
-
-    let(:env) { 'env' }
-    let(:prior_environment) { 'prior' }
-
-    before do
-      gemfile.stubs(:current_env).returns(env)
-      gemfile.stubs(:environment).returns(prior_environment)
-    end
-
-    context 'not deployment' do
-      before do
-        gemfile.stubs(:is_deployment).returns(false)
-      end
-
-      it { should == "# generated by penchant, environment: #{env}" }
-    end
-
-    context 'deployment' do
-      before do
-        gemfile.stubs(:is_deployment).returns(true)
-      end
-
-      it { should == "# generated by penchant, environment: #{env}, deployment mode (was #{prior_environment})" }
-    end
-  end
-
-  describe '#prior_environment' do
-    subject { gemfile.prior_environment }
-
-    let(:prior) { 'prior' }
-
-    before do
-      gemfile.stubs(:gemfile_header).returns("# header (was #{prior})")
-    end
-
-    it { should == prior }
-  end
-
-  describe '.switch_back!' do
-    let(:gemfile) { stub }
-    let(:fallback_env) { 'env' }
-
-    context 'pre_switch fails' do
-      before do
-        described_class.stubs(:pre_switch).returns(false)
-
-        gemfile.expects(:switch_back!).never
-      end
-
-      it 'should not switch back' do
-        described_class.switch_back!(fallback_env).should be_false
-      end
-    end
-
-    context 'pre_switch succeeds' do
-      before do
-        described_class.stubs(:pre_switch).returns(gemfile)
-
-        gemfile.expects(:switch_back!).with(fallback_env)
-      end
-
-      it 'should switch back' do
-        described_class.switch_back!(fallback_env)
-      end
-    end
-  end
-
-  describe '.pre_switch' do
-    subject { described_class.pre_switch(env, deployment) }
-
-    let(:env) { 'env' }
-    let(:deployment) { 'deployment' }
-
-    context 'no Gemfile.erb' do
-      before do
-        described_class.any_instance.expects(:has_gemfile_erb?).returns(false)
-      end
-
-      it { should be_false }
-    end
-
-    context 'Gemfile.erb' do
-      before do
-        described_class.any_instance.expects(:has_gemfile_erb?).returns(true)
-        described_class.any_instance.expects(:run_dot_penchant!).with(env, deployment)
-      end
-
-      it { should be_a_kind_of(described_class) }
-    end
-  end
-
-  describe '#switch_back!' do
-    let(:fallback_env) { 'fallback' }
-    let(:prior) { 'prior' }
-
-    context 'no prior' do
-      before do
-        gemfile.stubs(:prior_environment).returns(nil)
-
-        gemfile.expects(:switch_to!).with(fallback_env)
-      end
-
-      it 'should proxy through to switch_to!' do
-        gemfile.switch_back!(fallback_env)
-      end
-    end
-
-    context 'prior' do
-      before do
-        gemfile.stubs(:prior_environment).returns(prior)
-
-        gemfile.expects(:switch_to!).with(prior)
-      end
-
-      it 'should proxy through to switch_to!' do
-        gemfile.switch_back!(fallback_env)
-      end
-    end
-  end
-end
-