fudge 0.6.0 → 0.6.1

data/lib/fudge.rb

@@ -1,5 +1,3 @@
-require 'active_support/all'
-
 #This will fix errors: invalid byte sequence in US-ASCII (ArgumentError) when UTF-8 chars get
 #in the console output, ruby pre-2.0 only.
 Encoding.default_external = Encoding.default_internal = Encoding::UTF_8 if RUBY_VERSION =~ /1.9/
@@ -21,4 +19,3 @@ module Fudge
   autoload :FileFinder, 'fudge/file_finder'
   autoload :Formatters, 'fudge/formatters'
 end
-

data/lib/fudge/task_dsl.rb

@@ -1,9 +1,8 @@
 module Fudge
   # Domain specific language for expressing Tasks in the Fudgefile
   module TaskDSL
-    extend ActiveSupport::Concern
-
-    included do
+    # Sets up attr_writers the including class will need
+    def self.included(base)
       attr_writer :scope
     end
 

data/lib/fudge/tasks/composite_task.rb

@@ -32,7 +32,12 @@ module Fudge
       # the options contained for the specified task
       def task_options(task_name)
         # are there settings for the specified task?
-        fudge_settings.fetch(task_name, {}).symbolize_keys!
+        settings = fudge_settings.fetch(task_name, {})
+        key_syms = settings.map do |k, v|
+          key = k.to_sym rescue k
+          [key, v]
+        end
+        Hash[key_syms]
       end
 
       # load fudge settings for the current directory

data/lib/fudge/tasks/rspec.rb

@@ -22,7 +22,7 @@ module Fudge
       end
 
       def cmd(options={})
-        self.arguments = 'spec/' if arguments.blank?
+        self.arguments = 'spec/' if (arguments.nil? || arguments.empty?)
         bundle_cmd("rspec#{tty_options} #{arguments}", options)
       end
 

data/lib/fudge/tasks/task.rb

@@ -9,12 +9,14 @@ module Fudge
       #
       # @return [Symbol]
       def self.name
-        super.demodulize.underscore.downcase.to_sym
+        name = /(\w+::)*(?<class>\w+\z)/.match(super)[:class]
+        underscored = name.gsub(/(?<pre>[^_])(?<char>[A-Z])/, "\\k<pre>_\\k<char>")
+        underscored.downcase.to_sym
       end
 
       def initialize(*args)
         @args = args.dup
-        @options = @args.extract_options!
+        @options = @args[-1].kind_of?(Hash) ? @args.delete_at(-1) : {}
 
         @options.each do |k,v|
           send("#{k}=", v) if respond_to?("#{k}=")

data/lib/fudge/version.rb

@@ -1,4 +1,4 @@
 module Fudge
   # Define gem version
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/lib/fudge/version.rb.orig

@@ -0,0 +1,8 @@
+module Fudge
+  # Define gem version
+<<<<<<< HEAD
+  VERSION = '0.6.0'
+=======
+  VERSION = '0.5.1'
+>>>>>>> Update version and release notes
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fudge
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -339,6 +323,7 @@ files:
 - lib/fudge/rspec/matchers.rb
 - lib/fudge/with_directory.rb
 - lib/fudge/task_dsl.rb
+- lib/fudge/version.rb.orig
 - spec/support/dummy_task.rb
 - spec/support/output.rb
 - spec/support/tmpdir.rb
@@ -381,12 +366,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4535773292265968340
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4535773292265968340
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2