wrong 0.4.1-java → 0.4.2-java

data/lib/wrong/chunk.rb

@@ -1,17 +1,16 @@
 require 'ruby_parser'
 require 'ruby2ruby'
 
-begin
-  require "ParseTree"
-rescue LoadError => e
-  raise e unless e.message == "no such file to load -- ParseTree"
+def require_optionally(library)
+  begin
+    require library
+  rescue LoadError => e
+    raise e unless e.message == "no such file to load -- #{library}"
+  end
 end
 
-begin
-  require "sourcify"
-rescue LoadError => e
-  raise e unless e.message == "no such file to load -- sourcify"
-end
+require_optionally "ParseTree"
+require_optionally "sourcify"
 
 require "wrong/config"
 require "wrong/sexp_ext"

data/lib/wrong/config.rb

@@ -6,6 +6,7 @@ module Wrong
       Chunk.read_here_or_higher(".wrong")
     rescue Errno::ENOENT => e
       # couldn't find it
+      nil # In Ruby 1.8, "e" would be returned here otherwise
     end
     Config.new settings
   end
@@ -19,7 +20,8 @@ module Wrong
   end
 
   class Config < Hash
-    def initialize(string = nil)
+     def initialize(string = nil)
+      self[:aliases] = {:assert => [:assert], :deny => [:deny]}
       if string
         instance_eval string.gsub(/^(.*=)/, "self.\\1")
       end
@@ -33,22 +35,26 @@ module Wrong
       self[name.to_sym] = value
     end
 
+    def alias_assert_or_deny(valence, extra_name)
+      Wrong::Assert.send(:alias_method, extra_name, valence)
+      new_method_name = extra_name.to_sym
+      self[:aliases][valence] << new_method_name unless self[:aliases][valence].include?(new_method_name)
+    end
+
     def alias_assert(method_name)
-      Wrong::Assert.send(:alias_method, method_name, :assert)
-      self.assert_method_names << method_name.to_sym unless self.assert_method_names.include?(method_name)
+      alias_assert_or_deny(:assert, method_name)
     end
 
     def alias_deny(method_name)
-      Wrong::Assert.send(:alias_method, method_name, :deny)
-      self.deny_method_names << method_name.to_sym unless self.deny_method_names.include?(method_name)
+      alias_assert_or_deny(:deny, method_name)
     end
 
     def assert_method_names
-      (self[:assert_method] ||= [:assert])
+      self[:aliases][:assert]
     end
 
     def deny_method_names
-      (self[:deny_method] ||= [:deny])
+      self[:aliases][:deny]
     end
 
     def assert_methods

data/lib/wrong/helpers.rb

@@ -27,12 +27,7 @@ module Wrong
       streams.each do |stream|
         original[stream] = (stream == :stdout ? $stdout : $stderr)
         captured[stream] = StringIO.new
-        case stream
-          when :stdout
-            $stdout = captured[stream]
-          when :stderr
-            $stderr = captured[stream]
-        end
+        reassign_stream(stream, captured)
       end
 
       yield
@@ -53,14 +48,20 @@ module Wrong
         end
         # support nested calls to capturing
         original[stream] << captured[stream].string if original[stream].is_a? StringIO
-        case stream
-          when :stdout
-            $stdout = original[stream]
-          when :stderr
-            $stderr = original[stream]
-        end
+        reassign_stream(stream, original)
+      end
+    end
+
+    private
+    def reassign_stream(which, streams)
+      case which
+        when :stdout
+          $stdout = streams[which]
+        when :stderr
+          $stderr = streams[which]
       end
     end
+
   end
 
 end

data/lib/wrong/rainbow.rb

@@ -27,18 +27,23 @@ module Sickill
       :hide => 8,
     }
 
+    private
+    def set_color(color, ground = :foreground)
+      color = color.first if color.size == 1
+      wrap_with_code(get_color_code(color, ground))
+    end
+
+    public
     # Sets foreground color of this text.
     def foreground(*color)
-      color = color.first if color.size == 1
-      wrap_with_code(get_color_code(color, :foreground))
+      set_color(color, :foreground)
     end
     alias_method :color, :foreground
     alias_method :colour, :foreground
 
     # Sets background color of this text.
     def background(*color)
-      color = color.first if color.size == 1
-      wrap_with_code(get_color_code(color, :background))
+      set_color(color, :background)
     end
 
     # Resets terminal to default colors/backgrounds.

data/lib/wrong/version.rb

@@ -1,3 +1,3 @@
 module Wrong
-  VERSION = "0.4.1" unless defined?(Wrong::VERSION)
+  VERSION = "0.4.2" unless defined?(Wrong::VERSION)
 end

data/test/config_test.rb

@@ -54,6 +54,13 @@ alias_assert :yum
       end
     end
 
+    it "uses defaults if there is no .wrong file" do
+      Dir.chdir("/tmp") do # hopefull there's no .wrong file here or in /
+        config = Wrong.load_config
+        assert { config[:test_setting] == nil }
+      end
+    end
+
   end
 
   it "getting an undeclared setting" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: java
 authors: 
 - Steve Conover
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -07:00
+date: 2010-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -163,7 +163,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2619962454554443825
+      hash: 2441793829226803943
       segments: 
       - 0
       version: "0"