fudge 0.0.5 → 0.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmE4MjI5YjRiMjU5MDBjMDliOTJiODJjOGQyYzk0MmE5MzFkYTgxMg==
+  data.tar.gz: !binary |-
+    N2UzMGEyNDAxZGM2MDBhNWNlNTQwYWNlM2U4MTYxYzQ3MTU0MDM3Yg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YzZiMGNjZGNlZjk2MDgxNzVjMTBmMGNlZmQxMDQ3Zjg4YWM1OTIwOWI3ZTE1
+    MDY3NjFhMjlmNmE1NTEyZmNmNDM2NzVhMWFiMTAyZDZmNjYyNTA1MjE4ODBm
+    ZDc2ZjlkYWZkNmFjYWIwNWYwNzA3YWQ2MjcxZDQ0ZGRjYTYwYTE=
+  data.tar.gz: !binary |-
+    NzgxOTI4ZjI5YzY3MDk5ZDc2ZTljOGZiNjg1OTFjNTIxZTcxZWZhZmJjNTk5
+    YWI3ZGViNjliZWU4NDRkZjExZTA2MmFkNTc3YWU2Yjg1MjU3MjVkMGY3Y2Nm
+    ZjhlOTQ3ODIwZTc2NDg1MzM0M2MzZDA5OTNkOTYwMDk0OTc3Yjc=

data/lib/fudge.rb

@@ -7,9 +7,14 @@ module Fudge
   autoload :Cli, 'fudge/cli'
   autoload :Description, 'fudge/description'
   autoload :Exceptions, 'fudge/exceptions'
+  autoload :Generator, 'fudge/generator'
   autoload :Helpers, 'fudge/helpers'
   autoload :Parser, 'fudge/parser'
   autoload :Runner, 'fudge/runner'
   autoload :Tasks, 'fudge/tasks'
   autoload :TaskDSL, 'fudge/task_dsl'
+  autoload :WithDirectory, 'fudge/with_directory'
+  autoload :OutputChecker, 'fudge/output_checker.rb'
+  autoload :FileFinder, 'fudge/file_finder.rb'
 end
+

data/lib/fudge/build.rb

@@ -13,16 +13,17 @@ module Fudge
     end
 
     def run(options={})
+      output = options[:output] || $stdout
       success = super
       if callbacks
-        message "Running #{success ? 'success' : 'failure'} callbacks..."
+        message "Running #{success ? 'success' : 'failure'} callbacks...", output
         hooks = success ? @success_hooks : @failure_hooks
 
         hooks.each do |hook|
-          return false unless hook.run
+          return false unless hook.run :output => output
         end
       else
-        message "Skipping callbacks..."
+        message "Skipping callbacks...", output
       end
 
       success
@@ -30,8 +31,8 @@ module Fudge
 
     private
 
-    def message(message)
-      puts message.foreground(:cyan).bright
+    def message(message, output)
+      output.puts message.foreground(:cyan).bright
     end
   end
 end

data/lib/fudge/cli.rb

@@ -6,19 +6,8 @@ module Fudge
     desc "init", "Initialize a blank Fudgefile"
     # Initalizes the blank Fudgefile
     def init
-      path = File.expand_path('Fudgefile', Dir.pwd)
-
-      if File.exists?(path)
-        puts "Fudgefile already exists."
-      else
-        contents = ""
-        contents << "build :default do\n"
-        contents << "  task :rspec\n"
-        contents << "end"
-
-        File.open(path, 'w') { |f| f.write(contents) }
-        puts "Fudgefile created."
-      end
+      generator = Fudge::Generator.new(Dir.pwd)
+      generator.write_fudgefile
     end
 
     desc "build [BUILD_NAME]",

data/lib/fudge/description.rb

@@ -37,17 +37,21 @@ module Fudge
     end
 
     # Add actions to be invoked upon success
-    def on_success
-      task = Fudge::Tasks::CompositeTask.new
-      current_scope.success_hooks << task
-
-      with_scope(task) { yield }
+    def on_success(&block)
+      apply_hook(:success, &block)
     end
 
     # Add actions to be invoked upon failure
-    def on_failure
+    def on_failure(&block)
+      apply_hook(:failure, &block)
+    end
+
+    private
+
+    def apply_hook(event)
       task = Fudge::Tasks::CompositeTask.new
-      current_scope.failure_hooks << task
+      hooks = current_scope.public_send("#{event}_hooks")
+      hooks << task
 
       with_scope(task) { yield }
     end

data/lib/fudge/file_finder.rb

@@ -0,0 +1,35 @@
+module Fudge
+  # Allows building of commands which run against a set of files
+  class FileFinder
+    attr_reader :options
+
+    def initialize(options = {})
+      @options = options
+    end
+
+    # Generates a command line with command and any tty_option
+    def generate_command(name, tty_options)
+      cmd = []
+      cmd << name
+      cmd += tty_options
+      cmd << "`#{find_filters.join(' | ')}`"
+      cmd.join(' ')
+    end
+
+    private
+
+    def find_filters
+      filters = []
+      filters << 'find .'
+      filters << "grep -e '\\.rb$'"
+      filters << exclude_filter
+      filters.compact
+    end
+
+    def exclude_filter
+      if (pattern = options[:exclude])
+        "grep -v -e '#{pattern}'"
+      end
+    end
+  end
+end

data/lib/fudge/generator.rb

@@ -0,0 +1,42 @@
+module Fudge
+  #Generator for default Fudgefile
+  class Generator
+    attr_reader :pwd
+
+    def initialize(pwd)
+      @pwd = pwd
+    end
+
+    #Writes the fudgefile to initialized directory unless on present
+    def write_fudgefile
+      if exists?
+        puts "Fudgefile already exists."
+      else
+        writer { |file| file << build_templated }
+        puts "Fudgefile created."
+      end
+    end
+
+    private
+
+    def writer
+      File.open(path, 'w') { |f| yield f }
+    end
+
+    def path
+      @path ||= File.expand_path('Fudgefile', pwd)
+    end
+
+    def exists?
+      File.exists?(path)
+    end
+
+    def build_templated
+      contents = ""
+      contents << "build :default do\n"
+      contents << "  task :rspec\n"
+      contents << "end"
+    end
+
+  end
+end

data/lib/fudge/output_checker.rb

@@ -0,0 +1,55 @@
+#Task Output Checker
+class Fudge::OutputChecker
+  attr_reader :checker, :regex, :pass_block, :match, :output_io
+
+  def initialize(checker, output_io)
+    @checker = checker
+    @output_io = output_io
+  end
+
+  #Validates output against initialized checker
+  def check(output)
+    return true unless checker # We're ok if no output defined
+    extract_matchers
+    matches?(output) && block_passes?
+  end
+
+  private
+
+  def block_passes?
+    return true unless pass_block
+
+    # If we've got a callable, call it to check on regex matches
+    result = pass_block.call(match)
+    if success?(result)
+      true
+    else
+      output_io.puts error_message(result)
+    end
+  end
+
+  def success?(result)
+    result === true
+  end
+
+  def error_message(result)
+    result || "Output matched #{@regex} but condition failed."
+  end
+
+  def extract_matchers
+    # Check if we have a callable to parse the regex matches
+    if checker.is_a? Enumerable
+      @regex, @pass_block = checker
+    else
+      @regex = checker
+    end
+  end
+
+  def matches?(output)
+    # Do regex match and fail if no match
+    return true if (@match = output.match(regex))
+    output_io.puts "Output didn't match #{regex}."
+  end
+
+end
+

data/{spec/support → lib/fudge/rspec}/matchers.rb

@@ -4,19 +4,21 @@ RSpec::Matchers.define :be_registered_as do |key|
   end
 end
 
-
+# Collection of matchers for use in a test environment
 module FudgeMatchers
+  # Run matcher
   class Run
     attr_reader :args, :expected, :task
 
     def initialize(expected, args={})
       @expected = expected
       @args = args
+      @args[:output] ||= $stdout
     end
 
     def matches?(task)
       @task = task
-      ran = ''
+      ran = []
 
       if task.is_a?(Fudge::Tasks::Shell)
         to_stub = task
@@ -24,21 +26,23 @@ module FudgeMatchers
         to_stub = Fudge::Tasks::Shell.any_instance
       end
 
-      to_stub.stub(:run_command) do |cmd|
-        ran = cmd
+      to_stub.stub(:run_command) do |cmd, outputio|
+        raise "Run Command requires an output IOStream" unless outputio
+        ran << cmd
         ['dummy output', true]
       end
 
-      task.run(args || {})
+      task.run(args)
 
       @actual = ran
       if expected.is_a? Regexp
-        ran =~ expected
+        ran.any? {|cmd| cmd =~ expected}
       else
-        ran == expected
+        ran.include? expected
       end
     end
 
+    # Failure message
     def failure_message_for_should
       message = ""
       message << "Expected task :#{@task.class.name} "
@@ -48,6 +52,7 @@ module FudgeMatchers
   end
 end
 
+# Matcher to test a command has been run by the task
 def run_command(cmd, options={})
   FudgeMatchers::Run.new cmd, options
 end

data/lib/fudge/runner.rb

@@ -9,19 +9,32 @@ module Fudge
     #
     # @param [String] which_build Defaults to 'default'
     def run_build(which_build='default', options={})
-      which_build = String.new(which_build)
+      output = options[:output] || $stdout
+      output_start(which_build, output)
+      status = run(which_build, options)
+      output_status(status, output)
+    end
+
+    private
+
+    def output_start(which, output)
+      which_build = String.new(which)
 
-      puts "Running build ".foreground(:cyan) +
+      output.puts "Running build ".foreground(:cyan) +
         which_build.bright.foreground(:yellow)
+    end
 
+    def run(which, options)
       # Run the build
-      build = @description.builds[which_build.to_sym]
+      build = @description.builds[which.to_sym]
       build.callbacks = options[:callbacks]
-      status = build.run
+      build.run :output => options[:output]
+    end
 
+    def output_status(success, output)
       # Output status
-      if status
-        puts "Build SUCCEEDED!".foreground(:green).bright
+      if success
+        output.puts "Build SUCCEEDED!".foreground(:green).bright
       else
         raise Exceptions::BuildFailed
       end

data/lib/fudge/tasks.rb

@@ -29,5 +29,7 @@ module Fudge
     require 'fudge/tasks/rspec'
     require 'fudge/tasks/yard'
     require 'fudge/tasks/cane'
+    require 'fudge/tasks/flog'
+    require 'fudge/tasks/flay'
   end
 end

data/lib/fudge/tasks/cane.rb

@@ -17,12 +17,24 @@ module Fudge
 
       def tty_options
         args = []
-        args << "--no-doc"    unless options.fetch(:doc, true)
-        args << "--no-style"  unless options.fetch(:style, true)
+        args << doc_options
+        args << style_options
+        args << style_width_options
+        args.compact
+      end
+
+      def doc_options
+        "--no-doc" unless options.fetch(:doc, true)
+      end
+
+      def style_options
+        "--no-style"  unless options.fetch(:style, true)
+      end
+
+      def style_width_options
         if options.has_key?(:max_width)
-          args << "--style-measure #{options.fetch(:max_width)}"
+          "--style-measure #{options.fetch(:max_width)}"
         end
-        args
       end
     end
 

data/lib/fudge/tasks/clean_bundler_env.rb

@@ -3,16 +3,9 @@ module Fudge
     # Provides a sanitized running environment for Bundler
     class CleanBundlerEnv < CompositeTask
       def run(options={})
-        old_env = ENV
-        keys = ENV.keys.grep(/BUNDLE|RUBY/)
-
-        keys.each { |k| ENV[k] = nil }
-
-        result = super(options.merge(:bundler => true))
-
-        keys.each { |k| ENV[k] = old_env[k] }
-
-        result
+        Bundler.with_clean_env do
+          super(options.merge(:bundler => true))
+        end
       end
     end
 

data/lib/fudge/tasks/composite_task.rb

@@ -11,8 +11,9 @@ module Fudge
 
       # Runs the task (by default running all other tasks in order)
       def run(options={})
+        output = options[:output] || $stdout
         tasks.each do |t|
-          output_message(t)
+          output_message(t, output)
 
           return unless t.run(options)
         end
@@ -24,14 +25,25 @@ module Fudge
         t.respond_to?(:args) && t.args ? t.args.join(', ') : ''
       end
 
-      def output_message(t)
-          args_text = join_arguments(t)
+      def output_message(t, output)
+          message = []
+          message << running_coloured
+          message << task_name_coloured(t)
+          message << args_coloured(t)
+          output.puts message.join(' ')
+      end
+
+      def running_coloured
+        "Running task".foreground(:blue)
+      end
+
+      def task_name_coloured(t)
+        t.class.name.to_s.foreground(:yellow).bright
+      end
 
-          puts [
-            "Running task".foreground(:blue),
-            t.class.name.to_s.foreground(:yellow).bright,
-            args_text.foreground(:yellow).bright
-          ].join(' ')
+      def args_coloured(t)
+        args_text = join_arguments(t)
+        args_text.foreground(:yellow).bright
       end
     end
   end