mattock 0.5.3 → 0.7.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NWU5MDFhZGU0YWEwMjNlNzdiMzIyN2IzNTk2MDg1Y2NhODY2YWEwNQ==
+  data.tar.gz: !binary |-
+    NWMzNzQwZTFiZjRmNDcxNDdhNjU3YTNhMjY2MmQ4YTIzYmU5YmNiYQ==
+SHA512:
+  metadata.gz: !binary |-
+    MThlMzM0YzMyNjA3MjVlZTNjZWFkZTVhMTZmOGM2MTcxZWJjMzBjMjk2NDdm
+    MzJiYzdiZjE0MmYxNmYxZTdjZmY4YmIzZGI5NjYyYzBkOWZmYTFjM2Q5ZGY3
+    ZTUwN2EwNzkzYjM1ODc2ZjI4ZmYxNGRhZGU0ZDVjNWQ3ZDYxNGQ=
+  data.tar.gz: !binary |-
+    OWFkNGI4ZmY5YzhlMjFlZDRmNWM0MGQ4NDllNDE2NGE2NWQ1NzM5Mjc3ZWRk
+    OGQyZTgyMGU0NzAzNWNlMzkyZTdlODQ3NWE5NDFhMDYwNTNjZWYyNGMwZGRh
+    Y2Q0MDhlNDIwYjIzMzA0ZDcyMTEwZWMyN2IwYThlNDdjMGRjZDQ=

data/lib/mattock/bundle-command-task.rb

@@ -6,28 +6,37 @@ module Mattock
       env = {}
       if defined? Bundler
         %w{
-            BUNDLER_EDITOR
-            BUNDLE_APP_CONFIG
-            BUNDLE_BIN_PATH
-            BUNDLE_CONFIG
-            BUNDLE_PATH
-            BUNDLE_SPEC_RUN
-            DEBUG
-            DEBUG_RESOLVER
-            EDITOR
-            GEM_HOME
-            GEM_PATH
-            MANPAGER
-            PAGER
-            PATH
-            RB_USER_INSTALL
-            RUBYOPT
-            VISUAL
+          BUNDLER_EDITOR
+          BUNDLE_APP_CONFIG
+          BUNDLE_CONFIG
+          BUNDLE_PATH
+          BUNDLE_SPEC_RUN
+          DEBUG
+          DEBUG_RESOLVER
+          EDITOR
+          GEM_HOME
+          GEM_PATH
+          MANPAGER
+          PAGER
+          PATH
+          RB_USER_INSTALL
+          RUBYOPT
+          VISUAL
+          bundle_bin
+          bundle_dir
         }.each do |bundler_varname|
+          next if ENV[bundler_varname] == Bundler::ORIGINAL_ENV[bundler_varname]
           env[bundler_varname] = Bundler::ORIGINAL_ENV[bundler_varname]
         end
+        %w{
+          bundle_bin
+          bundle_dir
+          BUNDLE_BIN_PATH
+          BUNDLE_GEMFILE
+        }.each do |bundler_varname|
+          env[bundler_varname] = nil
+        end
       end
-      env["BUNDLE_GEMFILE"] = nil
       env
     end
 

data/lib/mattock/command-line.rb

@@ -2,27 +2,32 @@ require 'mattock/command-line/command-run-result'
 
 module Mattock
   class CommandLine
-    def self.define_chain_op(opname, klass)
-      define_method(opname) do |other|
-        unless CommandLine === other
-          other = CommandLine.new(*[*other])
+    class << self
+      def define_chain_op(opname, klass)
+        define_method(opname) do |other|
+          unless CommandLine === other
+            other = CommandLine.new(*[*other])
+          end
+          chain = nil
+          if klass === self
+            chain = self
+          else
+            chain = klass.new
+            chain.add(self)
+          end
+          chain.add(other)
         end
-        chain = nil
-        if klass === self
-          chain = self
-        else
-          chain = klass.new
-          chain.add(self)
-        end
-        chain.add(other)
       end
-    end
 
-    def self.define_op(opname)
-      CommandLine.define_chain_op(opname, self)
+      def define_op(opname)
+        CommandLine.define_chain_op(opname, self)
+      end
+
+      attr_accessor :output_stream
     end
 
     def initialize(executable, *options)
+      @output_stream = self.class.output_stream || $stderr
       @executable = executable
       @options = options
       @redirections = []
@@ -30,7 +35,7 @@ module Mattock
       yield self if block_given?
     end
 
-    attr_accessor :name, :executable, :options, :env
+    attr_accessor :name, :executable, :options, :env, :output_stream
     attr_reader :redirections
 
     alias_method :command_environment, :env
@@ -87,8 +92,8 @@ module Mattock
     end
 
     def replace_us
-      puts "Ceding execution to: "
-      puts string_format
+      output_steeam.puts "Ceding execution to: "
+      output_stream.puts string_format
       Process.exec(command_environment, command)
     end
 
@@ -144,14 +149,18 @@ module Mattock
       collect_result(pid, out, err)
     end
 
+    def report(message, newline=true)
+      output_stream.print(message + (newline ? "\n" : ""))
+    end
+
     def run
-      print string_format + " "
+      report string_format + " ", false
       result = execute
-      puts "=> #{result.exit_code}"
-      puts result.format_streams if verbose
+      report "=> #{result.exit_code}"
+      report result.format_streams if verbose
       return result
     ensure
-      puts if verbose
+      report "" if verbose
     end
 
     def succeeds?

data/lib/mattock/command-line/command-run-result.rb

@@ -74,9 +74,9 @@ module Mattock
           if !@buffered_echo.nil?
             timeout = begin_echoing - Time.now
             if timeout < 0
-              puts
-              puts "Long running command output:"
-              puts @buffered_echo.join
+              @command.report ""
+              @command.report "Long running command output:"
+              @command.report @buffered_echo.join
               @buffered_echo = nil
             end
           end
@@ -113,7 +113,7 @@ module Mattock
             begin
               while chunk = io.read_nonblock(4096)
                 if @buffered_echo.nil?
-                  print chunk
+                  @command.report chunk, false
                 else
                   @buffered_echo << chunk
                 end

data/lib/mattock/configurable/class-methods.rb

@@ -146,11 +146,7 @@ module Mattock
         end
         default_values.each do |field|
           next unless field.is? :defaulting
-          value = field.default_value
-          if Module === value and Configurable > value
-            value = value.new
-            value.class.set_defaults_on(value)
-          end
+          value = field.build_default_value
           instance.__send__(field.writer_method, value)
         end
       end

data/lib/mattock/configurable/directory-structure.rb

@@ -1,3 +1,5 @@
+require 'rake'
+
 module Mattock
   module Configurable
     class MissingRelativePaths < Exception; end
@@ -16,6 +18,11 @@ module Mattock
         setting :absolute_path
         setting :relative_path
 
+        alias abspath absolute_path
+        alias relpath relative_path
+
+        #No #path - ambiguous whether that would be abspath or pathname
+
         def initialize(rel_path)
           self.relative_path = rel_path unless rel_path == Configurable::RequiredField
         end
@@ -30,15 +37,21 @@ module Mattock
         end
         alias path_name pathname
 
+        if (false)
         def inspect
           "<path: #{
-            if unset?(:absolute_path)
-              "<<?>>/#{relative_path.inspect}"
+            if field_unset?(:absolute_path)
+              if field_unset?(:relative_path)
+                "<<?>>"
+              else
+                "?/#{relative_path}"
+              end
             else
               absolute_path.inspect
             end
           }>"
         end
+        end
       end
 
       module ClassMethods

data/lib/mattock/configurable/field-metadata.rb

@@ -72,6 +72,38 @@ module Mattock
         name
       end
 
+      def copy_from(instance)
+        return if unset_on?(instance)
+        copy_value(immediate_value_on(instance))
+      end
+
+      def build_default_value
+        if Module === @default_value and Configurable > @default_value
+          value = @default_value.new
+          value.class.set_defaults_on(value)
+          value
+        else
+          copy_value(@default_value)
+        end
+      end
+
+      def copy_value(value)
+        case value
+        when Symbol, Numeric, NilClass, TrueClass, FalseClass
+          value
+        else
+          if value.class == BasicObject
+            value
+          elsif value.respond_to?(:dup)
+            value.dup
+          elsif value.respond_to?(:clone)
+            value.clone
+          else
+            value
+          end
+        end
+      end
+
       def immediate_value_on(instance)
         instance.instance_variable_get(ivar_name)
         #instance.__send__(reader_method)

data/lib/mattock/configurable/field-processor.rb

@@ -8,24 +8,20 @@ module Mattock
       attr_accessor :field_names
       attr_reader :source
 
-      def filter_attribute
-        raise NotImplementedError
-      end
-
       def filter(field_names)
         field_names.find_all do |name|
           source.class.field_metadata(name).is?(filter_attribute)
         end
       end
 
-      def value(field)
-        source.__send__(field.reader_method)
+      def can_process(field, target)
+        target.respond_to?(field.writer_method)
       end
 
       def to(target)
         field_names.each do |name|
           field = source.class.field_metadata(name)
-          next unless target.respond_to?(field.writer_method)
+          next unless can_process(field, target)
           target.__send__(field.writer_method, value(field))
         end
       end
@@ -36,8 +32,12 @@ module Mattock
         :copiable
       end
 
+      def can_process(field, target)
+        super and not( field.unset_on?(source) and field.unset_on?(target) )
+      end
+
       def value(field)
-        field.immediate_value_on(source)
+        return field.copy_from(source)
       end
     end
 

data/lib/mattock/configurable/instance-methods.rb

@@ -1,5 +1,11 @@
+require 'mattock/configurable/directory-structure'
+
 module Mattock
   module Configurable
+    def initialize_copy(original)
+      original.copy_settings_to(self)
+    end
+
     def copy_settings
       SettingsCopier.new(self)
     end
@@ -52,6 +58,7 @@ module Mattock
 
     #XXX deprecate
     def unset?(value)
+      warn "#unset? is deprecated - use field_unset? instead"
       value.nil?
     end
 
@@ -70,6 +77,7 @@ module Mattock
 
     class Struct
       include Configurable
+      include Configurable::DirectoryStructure
     end
   end
 end

data/lib/mattock/task.rb

@@ -59,11 +59,10 @@ module Mattock
       Configurable.included(sub)
       Configurable::DirectoryStructure.included(sub)
       DeferredDefinition.add_settings(sub)
+      sub.setting :task_name
+      sub.setting :task_args
     end
 
-    setting :task_name
-    setting :task_args
-
     attr_accessor :base_task
 
     def resolve_configuration

data/lib/mattock/template-task.rb

@@ -0,0 +1,51 @@
+require 'mattock/task'
+module Mattock
+  class TemplateTask < Mattock::Rake::FileTask
+    setting :templates
+    setting :source_path
+    setting :local_variables, {}
+    setting :context
+
+    path :target
+
+    setting :search_dirs, []
+
+    def default_configuration(context)
+      super
+
+      self.context = context
+
+      if field_unset?(:task_name)
+        unless field_unset?(:source_path)
+          target.relative_path = source_path
+        end
+      end
+    end
+
+    def resolve_configuration
+      if field_unset?(:source_path)
+        self.source_path = File::basename(task_name)
+      end
+
+      if target.field_unset?(:relative_path)
+        target.absolute_path = task_name
+      end
+
+      self.templates ||=
+        begin
+          require 'valise'
+          Valise::read_only(*search_dirs).templates
+        end
+
+      resolve_paths
+
+      super
+    end
+
+    def action(args)
+      File::open(target.absolute_path, "w") do |target|
+        target.write(templates.find(source_path).contents.render(context, local_variables))
+      end
+    end
+  end
+end

data/lib/mattock/testing/rake-example-group.rb

@@ -13,6 +13,14 @@ module Mattock
 
     def self.included(mod)
       mod.class_eval do
+        before :each do
+          @tempdir = File.join "/tmp", "test_mattock_#{$$}"
+
+          @original_PWD = Dir.pwd
+          FileUtils.mkdir_p @tempdir
+          Dir.chdir @tempdir
+        end
+
         let! :rake do
           ::Rake.application = ::Rake::Application.new
           ::Rake::TaskManager.record_task_metadata = true
@@ -43,14 +51,6 @@ module Mattock
           end
         end
 
-        before :each do
-          @tempdir = File.join "/tmp", "test_mattock_#{$$}"
-
-          @original_PWD = Dir.pwd
-          FileUtils.mkdir_p @tempdir
-          Dir.chdir @tempdir
-        end
-
         after :each do
           Dir.chdir @original_PWD
           FileUtils.rm_rf @tempdir

data/spec/configurable.rb

@@ -82,6 +82,30 @@ describe Mattock::Configurable do
       path(:loose_path, "here")
     end
 
+    describe "distinctness" do
+      let :one do
+        DirectoryThing.new.tap do |thing|
+          thing.setup_defaults
+        end
+      end
+
+      let :other do
+        DirectoryThing.new.tap do |thing|
+          thing.setup_defaults
+        end
+      end
+
+      it "should have same values" do
+        one.bundle_workdir.relative_path.should == other.bundle_workdir.relative_path
+      end
+
+      it "should have different actual objects" do
+        one.bundle_workdir.relative_path.should_not equal other.bundle_workdir.relative_path
+        one.bundle_workdir.should_not equal other.bundle_workdir
+      end
+
+    end
+
     def subject
       DirectoryThing.new.tap do |thing|
         thing.setup_defaults
@@ -183,7 +207,10 @@ describe Mattock::Configurable do
     class LeftStruct
       include Mattock::Configurable
 
-      setting(:normal, 1)
+      setting(:normal, "1")
+      setting(:nested, nested{
+        setting :value, "2"
+      })
       setting(:no_copy, 2).isnt(:copiable)
       setting(:no_proxy, 3).isnt(:proxiable)
       setting(:no_nothing, 4).isnt(:copiable).isnt(:proxiable)
@@ -193,7 +220,7 @@ describe Mattock::Configurable do
     class RightStruct
       include Mattock::Configurable
 
-      required_fields(:normal, :no_copy, :no_proxy, :no_nothing)
+      required_fields(:normal, :nested, :no_copy, :no_proxy, :no_nothing)
     end
 
     let :left do
@@ -204,24 +231,33 @@ describe Mattock::Configurable do
       RightStruct.new.setup_defaults
     end
 
+    it "should make copies not references" do
+      left.copy_settings_to(right)
+      right.normal.should == left.normal
+      right.normal.should_not equal(left.normal)
+      right.nested.value.should == left.nested.value
+      right.nested.should_not equal(left.nested)
+      right.nested.value.should_not equal left.nested.value
+    end
+
     it "should not copy no_copy" do
       left.copy_settings_to(right)
-      right.unset?(right.normal).should be_false
-      right.normal.should == 1
-      right.unset?(right.no_copy).should be_true
-      right.unset?(right.no_proxy).should be_false
+      right.field_unset?(:normal).should be_false
+      right.normal.should == "1"
+      right.field_unset?(:no_copy).should be_true
+      right.field_unset?(:no_proxy).should be_false
       right.no_proxy.should == 3
-      right.unset?(right.no_nothing).should be_true
+      right.field_unset?(:no_nothing).should be_true
     end
 
     it "should not proxy no_proxy" do
       left.proxy_settings.to(right)
-      right.unset?(right.normal).should be_false
-      right.normal.should == 1
-      right.unset?(right.no_copy).should be_false
+      right.field_unset?(:normal).should be_false
+      right.normal.should == "1"
+      right.field_unset?(:no_copy).should be_false
       right.no_copy.should == 2
-      right.unset?(right.no_proxy).should be_true
-      right.unset?(right.no_nothing).should be_true
+      right.field_unset?(:no_proxy).should be_true
+      right.field_unset?(:no_nothing).should be_true
     end
   end
 end

data/spec_help/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rspec'
+require 'rspec/core/formatters/base_formatter'
 require 'file-sandbox'
 require 'cadre/rspec'
 

metadata

@@ -1,98 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: mattock
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.5.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
   prerelease: false
-  type: :development
   name: corundum
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
-    none: false
+  type: :development
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
-    none: false
-- !ruby/object:Gem::Dependency
+        version: '10.0'
   prerelease: false
-  type: :runtime
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        segments:
-        - 10
-        - 0
         version: '10.0'
-    none: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        segments:
-        - 10
-        - 0
-        version: '10.0'
-    none: false
-- !ruby/object:Gem::Dependency
+        version: 0.9.1
   prerelease: false
-  type: :runtime
   name: valise
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        segments:
-        - 0
-        - 9
-        - 1
         version: 0.9.1
-    none: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ! '>'
       - !ruby/object:Gem::Version
-        segments:
-        - 0
-        - 9
-        - 1
-        version: 0.9.1
-    none: false
-- !ruby/object:Gem::Dependency
+        version: '0'
   prerelease: false
-  type: :runtime
   name: tilt
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
-        segments:
-        - 0
-        version: '0'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        segments:
-        - 0
         version: '0'
-    none: false
+  type: :runtime
 description: ! "  If Rake won't do it by itself, you oughtta Mattock.\n\n  If you
   survived the pun, you might enjoy this gem.\n\n  Features:\n\n  * Extensions to
   Tasklibs to support powerful deerpaths.\n  * A commandline library that supports
@@ -123,6 +96,7 @@ files:
 - lib/mattock/bundle-command-task.rb
 - lib/mattock/tasklib.rb
 - lib/mattock/task.rb
+- lib/mattock/template-task.rb
 - lib/mattock/configurable.rb
 - lib/mattock/configurable/field-processor.rb
 - lib/mattock/configurable/proxy-value.rb
@@ -147,33 +121,29 @@ files:
 homepage: http://nyarly.github.com/mattock/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --inline-source
 - --main
 - doc/README
 - --title
-- mattock-0.5.3 RDoc
+- mattock-0.7.0 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 509890867
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: mattock
-rubygems_version: 1.8.24
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 3
 summary: A powerful companion to Rake