travis 1.6.2.travis.366.4 → 1.6.2.travis.367.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTIzYWU4ZThiMjc1ZmYxYjI3MWNmZjdiZjNmNzdlMDJkZWRkYjU0ZA==
+    MTk5YzM2YWU1MGQ4OWE2NzYyYjFiNDhiNDhjNzNmMGJlZDFhNzlhOA==
   data.tar.gz: !binary |-
-    ZGJhNGYxZjRkZjAwYmY1MDE0ZmMwYWRhNjVmNDE5ZDYxOGExOTI0Yg==
+    NzcxODViZDI2Y2JkNDk3OWFhNGIxMDg0NTJhNjJjYjA3ZTg4MDhjNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWRhYTM5OTg3MDBlM2QyNmJiYzYzZmYzNDBhNTA4MjE2YTZhMTRjNGE3MjAz
-    ZGEzMGUyYzllMzJmYTc3M2UyMjQ1NzVhM2JhOGQ4ODUyMzE3NzI2ZjdmMjgy
-    NzU4MzlhMGY0M2RlMGVlMTQwZDljYTNiNjQ5MTE2YjBhOTc1ZjM=
+    NTUwZmI1YmE1YWIyMDNlY2UzNGZmM2M4YjM0MzRkNTJjMzdiNmU0N2UwZjNl
+    MGJhY2MyZTNkNTU2NjBmNzZiZDExYjUzMzE5Mjk1Y2E2NTViZDI3YmE2YTI4
+    MGUwZjQ4MDA4YjI0MTkyMTU2NTVhYzJhNGFiZWI4OGQ4MmEzZDM=
   data.tar.gz: !binary |-
-    YzM2ZWY1NjU3ODU3YWM3M2YyOWQwMTJjZWIzZTY0YTljYzk0MDE1NGE0ZTMx
-    MjJiZDI1YjA2Mzg4NWQ4MTI3ZDFkNTY1YzMyZTM1M2JjOGE3MWVkNjkwZWQ3
-    YzVlYThmNDkzYmRiNWFmYjY1OWRkYTliZjE4NWU2ZTU4NjQ2ZDk=
+    MDU2MTE1MTUzMzM5NGQ3MWMxZTQwNzYzNzMzNDBlNWQ5NDAxYTBmODA3NzM5
+    NGJhZTdmNzI2MTU0NTAyY2Y5MTBlMmYwMjliYTFhYzQzZDhlMzIyYzViYWQ0
+    ZDQwN2RlYmEwZTUxMjdkYzkzOGI2NGUyZDAyZWVhNzg2ZTk2ZDI=

data/lib/travis/cli/command.rb

@@ -17,7 +17,7 @@ module Travis
       extend Parser, Forwardable, Tools::Assets
       def_delegators :terminal, :agree, :ask, :choose
 
-      HighLine.use_color = !Tools::System.windows? && $stdout.tty?
+      HighLine.use_color = Tools::System.unix? && $stdout.tty?
       HighLine.color_scheme = HighLine::ColorScheme.new do |cs|
         cs[:command]   = [ :bold             ]
         cs[:error]     = [ :red              ]
@@ -33,7 +33,7 @@ module Travis
       end
 
       on('-i', '--[no-]interactive', "be interactive and colorful") do |c, v|
-        HighLine.use_color = v unless Tools::System.windows?
+        HighLine.use_color = v if Tools::System.unix?
         c.force_interactive = v
       end
 

data/lib/travis/cli/report.rb

@@ -44,7 +44,7 @@ module Travis
 
       def general
         yield "Ruby",               Tools::System.ruby
-        yield "Operating System",   Tools::System.full_os
+        yield "Operating System",   Tools::System.os
         yield "RubyGems",           Tools::System.rubygems
       end
 

data/lib/travis/tools/notification.rb

@@ -41,7 +41,7 @@ module Travis
         end
 
         def available?
-          System.mac? and `sw_vers -productVersion`.strip >= '10.8'
+          System.mac? and System.os_version.to_s >= '10.8'
         end
       end
 
@@ -55,7 +55,7 @@ module Travis
         end
 
         def available?
-          system "which #{@command} >/dev/null 2>/dev/null" unless System.windows?
+          System.has? @command
         end
       end
 

data/lib/travis/tools/system.rb

@@ -15,12 +15,30 @@ module Travis
         RUBY_PLATFORM =~ /linux/i
       end
 
+      def unix?
+        not windows?
+      end
+
       def os
-        @os ||= windows? ? "Windows" : `uname`.chomp
+        os_name ? "#{os_name} #{os_version}".strip : os_type
       end
 
       def full_os
-        @full_os ||= mac? ? "#{`sw_vers -productName`.chomp} #{`sw_vers -productVersion`.chomp}" : os
+        os_name == os_type ? os : "#{os} like #{os_type}"
+      end
+
+      def os_version
+        @os_version ||= has?(:sw_vers)     && `sw_vers -productVersion`.chomp
+        @os_version ||= has?(:lsb_release) && `lsb_release -r -s`.chomp
+      end
+
+      def os_name
+        @os_name ||= has?(:sw_vers)     && `sw_vers -productName`.chomp
+        @os_name ||= has?(:lsb_release) && `lsb_release -i -s`.chomp
+      end
+
+      def os_type
+        @os_type ||= `uname`.chomp
       end
 
       def ruby_engine
@@ -46,7 +64,13 @@ module Travis
       end
 
       def description(*args)
-        [ os, ruby, rubygems, *args.flatten].compact.uniq.join("; ")
+        [ full_os, ruby, rubygems, *args.flatten].compact.uniq.join("; ")
+      end
+
+      def has?(command)
+        return false unless unix?
+        @has ||= {}
+        @has.fetch(command) { @has[command] = system "which #{command} 2>/dev/null >/dev/null" }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.6.2.travis.366.4
+  version: 1.6.2.travis.367.4
 platform: ruby
 authors:
 - Konstantin Haase