wwtd 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa67745551b56d3fb2c7fbf2e06fb3a253916877
-  data.tar.gz: 5e2fb3b4a30fab6c8e1c12ea35bb36eb4a64d058
+  metadata.gz: 4bc9fc99c14b0d246c0fa04f9dd3555d8cace6be
+  data.tar.gz: 42c7cd96d020415b8e4809fb3bdfaffd1cee3964
 SHA512:
-  metadata.gz: e5b6f48c94877458ff7bf8707ad0954eaf12d07a7e7a16e3309039effb34a5843afda6cbc1d7d91b4ad9666f6c04554a907b929a6857a7119e505aa458d3f718
-  data.tar.gz: 70871fa5a3d12a9d986461d0c82406f84d398a8d1b634a2233201b38067ff9fb83d8971bf91c15f6bac0576f8eb2467c5c3ab511d71519ea0b80efb5ffa2210e
+  metadata.gz: f0c5eee13ac1855633dd96578029ee1bc777c625280940c5be2e0fb30c842ff534b1aa0ad5b33b4fb5b97cd39f7df4156b07511e68484fe9f86db0bdeb39282f
+  data.tar.gz: 848d096ac13598c827c2cccd3a828e85153d7329f265e4ed6b7eaade1b5b40e525322a8e15b7e3316519ecf825425619ccba069ea0ed47890f2acc3c82d8916e

data/lib/wwtd.rb

@@ -5,7 +5,6 @@ require "shellwords"
 require "parallel"
 require "tempfile"
 require "tmpdir"
-require "wwtd/colors"
 require "wwtd/ruby"
 require "wwtd/cli"
 

data/lib/wwtd/cli.rb

@@ -1,13 +1,14 @@
 module WWTD
   module CLI
     INFO_MAX_CHARACTERS = 30
-    COLOR_MAP = {:start => :yellow, :success => :green}
+    STATE_COLOR_MAP = {:start => :yellow, :success => :green}
+    ASCII_COLORS = {:red => 31, :green => 32, :yellow => 33}
 
     class << self
       def run(argv=[])
         # Read travis.yml
         matrix, ignored = ::WWTD.read_travis_yml
-        puts "Ignoring: #{ignored.sort.join(", ")}" unless ignored.empty?
+        puts "Ignoring: #{ignored.sort.join(", ")}" if ignored.any?
 
         # Execute tests
         results = ::WWTD.run(matrix, parse_options(argv)) do |state, config|
@@ -25,10 +26,28 @@ module WWTD
 
       private
 
+      def parse_options(argv)
+        options = {}
+        OptionParser.new do |opts|
+          opts.banner = <<-BANNER.gsub(/^ {10}/, "")
+            WWTD: Travis simulator - faster + no more waiting for build emails
+
+            Usage:
+                wwtd
+
+            Options:
+          BANNER
+          opts.on("-p", "--parallel [PROCESSES]", Integer, "Run in parallel") { |c| options[:parallel] = c || Parallel.processor_count }
+          opts.on("-h", "--help", "Show this.") { puts opts; exit }
+          opts.on("-v", "--version", "Show Version"){ puts WWTD::VERSION; exit}
+        end.parse!(argv)
+        options
+      end
+
       def info_line(state, config, matrix)
         config_info = config_info(matrix, config)
-        color = COLOR_MAP[state] || :red
-        "#{Colors.send(color, state.to_s.upcase)} #{config_info}"
+        color = STATE_COLOR_MAP[state] || :red
+        "#{colorize(color, state.to_s.upcase)} #{config_info}"
       end
 
       # human readable config without options that are the same in all configs
@@ -51,22 +70,12 @@ module WWTD
         end
       end
 
-      def parse_options(argv)
-        options = {}
-        OptionParser.new do |opts|
-          opts.banner = <<-BANNER.gsub(/^ {10}/, "")
-            WWTD: Travis simulator - faster + no more waiting for build emails
-
-            Usage:
-                wwtd
-
-            Options:
-          BANNER
-          opts.on("-p", "--parallel [PROCESSES]", Integer, "Run in parallel") { |c| options[:parallel] = c || Parallel.processor_count }
-          opts.on("-h", "--help", "Show this.") { puts opts; exit }
-          opts.on("-v", "--version", "Show Version"){ puts WWTD::VERSION; exit}
-        end.parse!(argv)
-        options
+      def colorize(color, string)
+        if $stdout.tty?
+          "\e[#{ASCII_COLORS[color]}m#{string}\e[0m"
+        else
+          string
+        end
       end
     end
   end

data/lib/wwtd/tasks.rb

@@ -1,6 +1,6 @@
 require "wwtd"
 
-run_wwtd = lambda { |args| exit 1 unless WWTD.run(args) == 0 }
+run_wwtd = lambda { |args| exit 1 unless WWTD::CLI.run(args) == 0 }
 task :wwtd do
   run_wwtd.call([])
 end

data/lib/wwtd/version.rb

@@ -1,3 +1,3 @@
 module WWTD
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wwtd
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Michael Grosser
@@ -55,7 +55,6 @@ files:
 - bin/wwtd
 - lib/wwtd.rb
 - lib/wwtd/cli.rb
-- lib/wwtd/colors.rb
 - lib/wwtd/ruby.rb
 - lib/wwtd/tasks.rb
 - lib/wwtd/version.rb

data/lib/wwtd/colors.rb

@@ -1,25 +0,0 @@
-module WWTD
-  module Colors
-    class << self
-      def tint(color, string)
-        if $stdout.tty?
-          "\e[#{color}m#{string}\e[0m"
-        else
-          string
-        end
-      end
-
-      def red(string)
-        tint(31, string)
-      end
-
-      def green(string)
-        tint(32, string)
-      end
-
-      def yellow(string)
-        tint(33, string)
-      end
-    end
-  end
-end