more refactoring

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::PenchantFile.any_instance.stubs(:current_os).returns(os.to_sym)
 end

lib/penchant.rb

@@ -4,4 +4,6 @@ module Penchant
   autoload :DotPenchant, 'penchant/dot_penchant'
   autoload :Hooks, 'penchant/hooks'
   autoload :Env, 'penchant/env'
+  autoload :FileProcessor, 'penchant/file_processor'
+  autoload :PenchantFile, 'penchant/penchant_file'
 end

lib/penchant/file_processor.rb

@@ -0,0 +1,199 @@
+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 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
+
+    def ruby(version)
+      @output << %{ruby "#{version}"}
+    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 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
+end
+

lib/penchant/gemfile.rb

@@ -81,263 +81,6 @@ module Penchant
       gemfile_header['deployment mode'] != nil
     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
-
-      def ruby(version)
-        @output << %{ruby "#{version}"}
-      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 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 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

lib/penchant/penchant_file.rb

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