hansi 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c99a2ac8ce470c64e37c42a2e94af03d80a0fe
-  data.tar.gz: 8c8e39771a0a0c2fab16b746d937643655b3cdd7
+  metadata.gz: 0e5bd3afa496d114756e45864aecb904d1d5137d
+  data.tar.gz: d6443b78a92ca5bfdad880b1a611bf96f399f63e
 SHA512:
-  metadata.gz: a394c636b3fd0e8d4456377ad2b2c79223374612f9c71cf3a4f24b5df325bca79c01ebd1a9f0057e3155ef428af796f7d70532eb52d7796a2ba1d185347c8cd9
-  data.tar.gz: 64b7011cbd5a09b5aec138544197f86de4a703f773dcaba9c1c06ba99e6d55b1e54830fd54a0581a67aa039fb739f79f5fe85b801223ecafafcee11386619f4a
+  metadata.gz: 2929ffe924bd5c1a1dd7e2c0bc7e0fb0557c396eccac7814afb6805dc258814f5509c7a059ba079ef29c4d2dc1021e84e3244746aa27c89d55331e2254b27ce1
+  data.tar.gz: 29510590850dc6f444bcff2a33acc001467c53459199306a100ea2271c4a6cfc8607c20d17d6876ce821b109818c73c402f148cdbda0dbe61f00dd9d1a369e24

data/lib/hansi/mode_detector.rb

@@ -65,7 +65,7 @@ module Hansi
       else TERMS.keys.detect { |key| TERMS[key].include? term }
       end
     end
-  
+
     def from_xterm
       terminal_command ? 256 : 16
     end
@@ -119,9 +119,10 @@ module Hansi
 
     def iterm_version
       @iterm_version ||= env['TERM_PROGRAM_VERSION']
-      @iterm_version ||= if shell_out? and iterm_path = commands.detect { |c| c["/iTerm.app/Contents/MacOS/iTerm2"] }
-        info_path = Shellwords.escape(File.expand_path('../../Info', iterm_path))
-        `defaults read #{info_path} CFBundleVersion`.chomp if system 'which defaults >/dev/null'
+      @iterm_version ||= if shell_out? and iterm_path = commands.detect { |c| c["Contents/MacOS/iTerm"] }
+        iterm_path = iterm_path[/^(.*) [^ ]+$/, 1] while iterm_path and not File.exist?(iterm_path)
+        info_path  = File.expand_path('../../Info.plist', iterm_path)
+        `defaults read #{Shellwords.escape(info_path)} CFBundleVersion`.chomp if File.exist?(info_path) and system 'which defaults >/dev/null'
       end
     rescue Errno::ENOENT
     end

data/lib/hansi/theme.rb

@@ -41,7 +41,7 @@ module Hansi
 
     def merge(other)
       other_rules = self.class[other].rules
-      self.class.new(**other_rules, **rules)
+      self.class.new(**rules.merge(other_rules))
     end
 
     def to_h

data/lib/hansi/version.rb

@@ -1,3 +1,3 @@
 module Hansi
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/hansi/color_spec.rb

@@ -40,7 +40,7 @@ describe Hansi::Color do
     specify { color.to_ansi(mode: Hansi::TRUE_COLOR)  .should be == "\e[38;2;255;0;0m" }
 
     specify "unknown mode" do
-      expect { color.to_ansi(mode: 99) }.to raise_error
+      expect { color.to_ansi(mode: 99) }.to raise_error(ArgumentError)
     end
   end
 end

data/spec/hansi/theme_spec.rb

@@ -17,6 +17,13 @@ describe Hansi::Theme do
     end
   end
 
+  describe :merge do
+    specify do
+      new_theme = theme.merge(foo: :baz)
+      expect(new_theme.rules).to include(foo: :baz)
+    end
+  end
+
   describe :hash do
     specify { Hansi::Theme[:default].hash.should be == Hansi::Theme[{}].hash }
   end
@@ -33,4 +40,4 @@ describe Hansi::Theme do
     specify { theme.to_css                       .should be == ".foo, .bar {\n  color: #ff0000;\n}\n" }
     specify { theme.to_css { |name| "##{name}" } .should be == "#foo, #bar {\n  color: #ff0000;\n}\n" }
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hansi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tool
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Hipster ANSI color library