penchant 0.2.24 → 0.2.26

data/README.md

@@ -32,6 +32,9 @@ source :rubygems
 # ensure git hooks are installed when a gemfile is processed, see below
 ensure_git_hooks!
 
+# deploying to heroku and want 1.9.3 goodness?
+ruby '1.9.3'
+
 gem 'rails', '3.2.3'
 # expands to:
 #

data/Rakefile

@@ -1,22 +1,6 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-begin
-  require 'rspec/core/rake_task'
-
-  RSpec::Core::RakeTask.new(:spec)
-rescue LoadError
-  "#$! - no rspec"
-end
-
-begin
-  require 'rspec/core/rake_task'
-
-  RSpec::Core::RakeTask.new(:spec)
-rescue LoadError
-  "#$! - no rspec"
-end
-
 begin
   require 'cucumber'
   require 'cucumber/rake/task'
@@ -28,5 +12,5 @@ rescue LoadError
   "#$! - no cucumber"
 end
 
-task :default => [ :spec, :cucumber ]
+task :default => [ :cucumber ]
 

data/features/cli.feature

@@ -1,6 +1,6 @@
 Feature: CLI
   Scenario: Switch back to the original pre-deployment environment
-    Given I have the file "tmp/Gemfile.erb" with the content:
+    Given I have the file "tmp/Gemfile.penchant" with the content:
       """
       gem 'rake'
       """
@@ -12,7 +12,7 @@ Feature: CLI
     Then the file "tmp/Gemfile" should have the following content:
       """
       # generated by penchant, environment: local
-      gem 'rake'
+      gem "rake"
       """
       And the output should include "fallback: other"
 

data/features/ruby_gemfile.feature

@@ -263,6 +263,7 @@ Feature: Gemfiles
       gem "two", {:require=>nil}
       """
 
+  @wip
   Scenario: Set the opposite environment in the environment defaults
     Given I have the file "Gemfile.penchant" with the content:
       """
@@ -411,3 +412,14 @@ Feature: Gemfiles
       gem "one"
       """
 
+  Scenario: Pass through the Ruby version
+    Given I have the file "Gemfile.penchant" with the content:
+      """
+      ruby '1.9.3'
+      """
+    When I rebuild the Gemfile for "local" mode
+    Then the file "Gemfile" should have the following content:
+      """
+      # generated by penchant, environment: local
+      ruby "1.9.3"
+      """

data/features/step_definitions/given/i_am_on_the_linux_platform.rb

@@ -1,3 +1,3 @@
 Given /^I am on the "([^"]*)" platform$/ do |os|
-  Penchant::Gemfile::PenchantFile.any_instance.stubs(:current_os).returns(os.to_sym)
+  Penchant::FileProcessor.any_instance.stubs(:current_os).returns(os.to_sym)
 end

data/lib/penchant/custom_property.rb

@@ -0,0 +1,20 @@
+module Penchant
+  class CustomProperty
+    def initialize(value)
+      @value = value
+    end
+
+    def process(values)
+      if @value.respond_to?(:call)
+        @value.call(*values).to_a
+      else
+        @value.collect do |k, v|
+          v = v.dup.gsub(%r{\$(\d+)}) { |m| values[m.to_i - 1 ] }
+
+          [ k, v ]
+        end
+      end
+    end
+  end
+end
+

data/lib/penchant/defaults.rb

@@ -0,0 +1,11 @@
+module Penchant
+  class Defaults
+    def initialize
+      @defaults = {}
+    end
+
+    def [](key)
+      @defaults[key.to_s] ||= {}
+    end
+  end
+end

data/lib/penchant/env.rb

@@ -0,0 +1,18 @@
+module Penchant
+  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
+end
+

data/lib/penchant/file_processor.rb

@@ -0,0 +1,201 @@
+module Penchant
+  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
+
+    def initialize(data)
+      @data = data
+      @available_environments = []
+      @defined_git_repos = []
+      @defaults = Defaults.new
+      @properties = PropertyStackBuilder.new(@defaults)
+
+      @_current_env_defaults = {}
+    end
+
+    def result(_env, _is_deployment)
+      @environment = _env.to_s.to_sym
+      @is_deployment = _is_deployment
+
+      @output = []
+
+      instance_eval(@data)
+
+      @output.join("\n")
+    end
+
+    def <<(string)
+      @output << string
+    end
+
+    def env(*args)
+      options = {}
+      options = args.pop if args.last.kind_of?(::Hash)
+
+      @available_environments += args
+
+      requested_env_defaults = _defaults_for(Env.new(environment))
+
+      if block_given?
+        if for_environment?(args)
+          @_current_env_defaults = requested_env_defaults
+          yield
+          @_current_env_defaults = {}
+        else
+          if opposite_environment = (options[:opposite] or requested_env_defaults[:opposite])
+            if for_environment?([ environment, args, opposite_environment ].flatten.uniq)
+              @_current_env_defaults = requested_env_defaults
+              @_strip_pathing_options = true
+              yield
+              @_strip_pathing_options = false
+              @_current_env_defaults = {}
+            end
+          end
+        end
+      else
+        Env.new(args.shift)
+      end
+    end
+
+    def property(name, hash = nil, &block)
+      @properties[name] = hash || block
+    end
+
+    def opposites(left, right)
+      @defaults[Env.new(left)][:opposite] = right
+      @defaults[Env.new(right)][:opposite] = left
+    end
+
+    def for_environment?(envs)
+      envs.include?(environment) || environment == ANY_ENVIRONMENT
+    end
+
+    def no_deployment
+      yield if !is_deployment
+    end
+
+    def ensure_git_hooks!
+      Penchant::Hooks.install!
+    end
+
+    def os(*args)
+      yield if args.include?(current_os)
+    end
+
+    def defaults_for(*args)
+      defaults = args.pop
+
+      args.flatten.each do |gem|
+        @defaults[gem].merge!(defaults)
+      end
+    end
+
+    protected
+    def args_to_string(args)
+      args.inspect[1..-2]
+    end
+
+    def split_args(args)
+      template = {}
+
+      while args.last.instance_of?(Hash)
+        template.merge!(args.pop)
+      end
+
+      [ args, template ]
+    end
+
+    def call_and_indent_output(block = nil, &given_block)
+      index = @output.length
+      (block || given_block).call
+      index.upto(@output.length - 1) do |i|
+        @output[i] = "  " + @output[i]
+      end
+    end
+
+    def _defaults_for(gem_name)
+      result = @_current_env_defaults
+      result.merge(@defaults[gem_name] || {})
+    end
+
+    def current_os
+      require 'rbconfig'
+      case host_os = RbConfig::CONFIG['host_os']
+      when /darwin/
+        :darwin
+      when /linux/
+        :linux
+      else
+        host_os[%r{^[a-z]+}, 1].to_sym
+      end
+    end
+
+    def gem(*args)
+      gem_name = [ args.shift ]
+      template = {}
+
+      if args.last.kind_of?(::Hash)
+        template = args.pop
+      end
+
+      version = args.first
+
+      options = @properties.create_stack_for(template, @_strip_pathing_options).process_for_gem(gem_name.first, @_current_env_defaults)
+
+      args = [ gem_name.first ]
+      args << version if version
+
+      if options[:git]
+        @defined_git_repos << Penchant::Repo.new(options[:git])
+      end
+
+      args << options if !options.empty?
+
+      self << %{gem #{args_to_string(args)}}
+    end
+
+    def gems(*args)
+      gems, template = split_args(args)
+
+      gems.flatten.each do |gem_name|
+        options = @properties.create_stack_for(template, @_strip_pathing_options).process_for_gem(gem_name)
+
+        args = [ gem_name ]
+        args << options if !options.empty?
+
+        gem *args
+      end
+    end
+
+    def group(*args, &block)
+      self << ""
+      self << %{group #{args_to_string(args)} do}
+
+      call_and_indent_output(block)
+
+      self << %{end}
+    end
+
+    def ruby(*args)
+      passthrough :ruby, *args
+    end
+
+    def gemspec
+      passthrough :gemspec
+    end
+
+    def source(*args)
+      passthrough :source, *args
+    end
+
+    def passthrough(method, *args)
+      self << %{#{method} #{args_to_string(args)}}.strip
+    end
+  end
+end
+

data/lib/penchant/gemfile.rb

@@ -1,5 +1,3 @@
-require 'erb'
-
 module Penchant
   class Gemfile
     attr_reader :path, :is_deployment
@@ -51,28 +49,20 @@ module Penchant
       File.file?('.penchant')
     end
 
-    def gemfile_erb_path
-      file_in_path('Gemfile.erb')
-    end
-
     def gemfile_penchant_path
       file_in_path('Gemfile.penchant')
     end
 
-    def has_gemfile_erb?
-      File.file?(gemfile_erb_path)
-    end
-
     def has_gemfile_penchant?
       File.file?(gemfile_penchant_path)
     end
 
     def has_processable_gemfile?
-      has_gemfile_erb? || has_gemfile_penchant?
+      has_gemfile_penchant?
     end
 
     def processable_gemfile_path
-      has_gemfile_erb? ? gemfile_erb_path : gemfile_penchant_path
+      gemfile_penchant_path
     end
 
     def environment
@@ -83,329 +73,6 @@ 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
-
-      def self.handle_result(&block)
-        if block
-          @handle_result = block
-        else
-          @handle_result
-        end
-      end
-
-      def initialize(data)
-        @data = data
-        @available_environments = []
-        @defined_git_repos = []
-        @defaults = {}
-        @properties = {}
-
-        @_current_env_defaults = {}
-      end
-
-      def result(_env, _is_deployment)
-        @environment = _env.to_s.to_sym
-        @is_deployment = _is_deployment
-
-        @output = []
-
-        handle_result(@data)
-
-        @output.join("\n")
-      end
-
-      def env(*args)
-        options = {}
-        options = args.pop if args.last.kind_of?(::Hash)
-
-        @available_environments += args
-
-        requested_env_defaults = _defaults_for(Env.new(environment))
-
-        if block_given?
-          if for_environment?(args)
-            @_current_env_defaults = requested_env_defaults
-            yield
-            @_current_env_defaults = {}
-          else
-            if opposite_environment = (options[:opposite] or requested_env_defaults[:opposite])
-              if for_environment?([ environment, args, opposite_environment ].flatten.uniq)
-                @_current_env_defaults = requested_env_defaults
-                @_strip_pathing_options = true
-                yield
-                @_strip_pathing_options = false
-                @_current_env_defaults = {}
-              end
-            end
-          end
-        else
-          Env.new(args.shift)
-        end
-      end
-
-      def property(name, hash = nil, &block)
-        @properties[name] = hash || block
-      end
-
-      def opposites(left, right)
-        @defaults[Env.new(left).to_s] ||= {}
-        @defaults[Env.new(left).to_s][:opposite] = right
-
-        @defaults[Env.new(right).to_s] ||= {}
-        @defaults[Env.new(right).to_s][:opposite] = left
-      end
-
-      def for_environment?(envs)
-        envs.include?(environment) || environment == ANY_ENVIRONMENT
-      end
-
-      def no_deployment
-        yield if !is_deployment
-      end
-
-      def ensure_git_hooks!
-        Penchant::Hooks.install!
-      end
-
-      def os(*args)
-        yield if args.include?(current_os)
-      end
-
-      def defaults_for(*args)
-        defaults = args.pop
-
-        args.flatten.each do |gem|
-          @defaults[gem.to_s] ||= {}
-          @defaults[gem.to_s].merge!(defaults)
-        end
-      end
-
-      protected
-      def args_to_string(args)
-        args.inspect[1..-2]
-      end
-
-      def split_args(args)
-        template = {}
-
-        while args.last.instance_of?(Hash)
-          template.merge!(args.pop)
-        end
-
-        [ args, template ]
-      end
-
-      def call_and_indent_output(block)
-        index = @output.length
-        block.call
-        index.upto(@output.length - 1) do |i|
-          @output[i] = "  " + @output[i]
-        end
-      end
-
-      def process_options(gem_name, template = {})
-        properties = {}
-
-        property_stack = template.to_a
-
-        original_properties = process_option_stack(gem_name, property_stack)
-
-        if @_strip_pathing_options
-          [ :git, :branch, :path ].each { |key| original_properties.delete(key) }
-        end
-
-        properties = process_option_stack(gem_name, _defaults_for(gem_name).to_a).merge(original_properties)
-
-        properties.delete(:opposite)
-
-        Hash[properties.sort]
-      end
-
-      def process_option_stack(gem_name, stack)
-        property_stack = stack.dup
-        properties = {}
-
-        while !property_stack.empty?
-          key, value = property_stack.shift
-
-          if property = @properties[key]
-            values = [ value ].flatten
-
-            if property.respond_to?(:call)
-              property.call(*values).each do |k, v|
-                property_stack.push([ k, v ])
-              end
-            else
-              property.each do |k, v|
-                v = v.dup.gsub(%r{\$(\d+)}) { |m| values[m.to_i - 1 ] }
-                property_stack.push([ k, v ])
-              end
-            end
-          else
-            value = value % gem_name if value.respond_to?(:%)
-
-            properties[key] = value
-          end
-        end
-        
-        properties
-      end
-
-      def _defaults_for(gem_name)
-        result = @_current_env_defaults
-        result.merge(@defaults[gem_name.to_s] || {})
-      end
-
-      def current_os
-        require 'rbconfig'
-        case host_os = RbConfig::CONFIG['host_os']
-        when /darwin/
-          :darwin
-        when /linux/
-          :linux
-        else
-          host_os[%r{^[a-z]+}, 1].to_sym
-        end
-      end
-    end
-
-    class ERBFile < FileProcessor
-      def handle_result(data)
-        $stderr.puts "ERB files are deprecated. Please convert them to the Ruby format."
-
-        @output << ERB.new(data, nil, nil, '@_erbout').result(binding)
-      end
-
-      def env(check, template = {}, &block)
-        if check.to_s == @environment.to_s
-          original_erbout = @_erbout.dup
-          @_erbout = ''
-
-          output = instance_eval(&block).lines.to_a
-
-          output.each do |line|
-            if gem_name = line[%r{gem ['"]([^'"]+)['"]}, 1]
-              new_line = line.rstrip
-
-              if !(options = process_options(gem_name, template)).empty?
-                new_line += ", #{options.inspect}"
-              end
-
-              line.replace(new_line + "\n")
-            end
-          end
-
-          @_erbout = original_erbout + output.join
-        end
-      end
-
-      def gems(*gems)
-        template = {}
-        template = gems.pop if gems.last.instance_of?(Hash)
-
-        gems.flatten.each do |gem|
-          @_current_gem = gem
-          if block_given?
-            yield
-          else
-            @_erbout += gem(template) + "\n"
-          end
-        end
-      end
-
-      def gem(template = {})
-        output = "gem '#{@_current_gem}'" 
-        options = process_options(@_current_gem, template)
-        if !options.empty?
-          output += ", #{options.inspect}"
-        end
-        output
-      end
-    end
-
-    class PenchantFile < FileProcessor
-      def handle_result(data)
-        instance_eval(data)
-      end
-
-      def gem(*args)
-        gem_name = [ args.shift ]
-        template = {}
-
-        if args.last.kind_of?(::Hash)
-          template = args.pop
-        end
-
-        version = args.first
-
-        options = process_options(gem_name.first, template)
-
-        args = [ gem_name.first ]
-        args << version if version
-
-        if options[:git]
-          @defined_git_repos << Penchant::Repo.new(options[:git])
-        end
-
-        args << options if !options.empty?
-
-        @output << %{gem #{args_to_string(args)}}
-      end
-
-      def gemspec
-        @output << %{gemspec}
-      end
-
-      def gems(*args)
-        gems, template = split_args(args)
-
-        gems.flatten.each do |gem_name|
-          options = process_options(gem_name, template)
-
-          args = [ gem_name ]
-          args << options if !options.empty?
-
-          gem *args
-        end
-      end
-
-      def group(*args, &block)
-        @output << ""
-        @output << %{group #{args_to_string(args)} do}
-
-        call_and_indent_output(block)
-
-        @output << %{end}
-      end
-
-      def source(*args)
-        @output << %{source #{args_to_string(args)}}
-      end
-    end
-
     def available_environments
       process
       builder.available_environments
@@ -456,16 +123,7 @@ module Penchant
     end
 
     def builder
-      return @builder if @builder
-
-      klass = case File.extname(processable_gemfile_path)
-      when '.penchant'
-        PenchantFile
-      when '.erb'
-        ERBFile
-      end
-
-      @builder = klass.new(template)
+      @builder ||= FileProcessor.new(template)
     end
 
     def template