colorconfig 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8308a51603353511690ee54501c43b7d5b59634
-  data.tar.gz: c011f9d8bb35bb65a515305ce50a067893871802
+  metadata.gz: 43a7742ca93ab1464260a1b0d68f4d00757b4ae5
+  data.tar.gz: 6b2a12fdae1fba1112c32da9eb388916af2c0acc
 SHA512:
-  metadata.gz: c35a54cb707b07593e191fff2b73e11b128eb6ca26fd555be726297e536c88e46c7e5136c1de72289c42d893254349098c57840f3df97e909cc8cdadfba06935
-  data.tar.gz: a2ca99faad01999e1d9840a7143cd778bd53e9ff0ccff038ff885097fac4180b7202d211fc75177611df04841ae55c0b072f7ffa5fb919714b73f28b2b40ed1f
+  metadata.gz: e33a5ab9307f39988bc110d195419cd3022aa3917954a908e354e75389e8ed02284c149f4617ac3a33a08b19ba69765dda179c2167cac2f3df395993a00e47ac
+  data.tar.gz: 0d38094af9964f14d274470bbf326980f7558a7277fd7ff6aacbf4e5e4fc830ec97a0310527d7581a379013c4d74bf5815e0e063830ded9fe7c5dc3439e9a697

data/bin/colorconfig

@@ -7,65 +7,83 @@ require 'everyday-cli-utils'
 include EverydayCliUtils
 import :maputil, :ask
 
-config_files = {
-    mvn2: '~/mvn2-colors.yaml',
-    mvr:  '~/mvr-colors.yaml',
+Signal.trap('SIGINT') {
+  Process.waitall
+  puts
+  exit 1
 }
 
+def check_has_config(name)
+  begin
+    require name
+    true
+  rescue LoadError => e
+    # puts e
+    # puts e.backtrace.join("\n")
+    false
+  end
+end
+
+config_files = {}
+if check_has_config('mvn2')
+  config_files[:mvn2] = '~/mvn2-colors.yaml'
+else
+  puts 'mvn2 gem not installed.'
+end
+if check_has_config('mvr')
+  config_files[:mvr] = '~/mvr-colors.yaml'
+else
+  puts 'mvr gem not installed.'
+end
+
 default_options = {
-    mvn2: {
-        time:    {
-            fg: :green,
-            bg: :none,
-        },
-        percent: {
-            fg: :purple,
-            bg: :none,
-        },
-        average: {
-            fg: :cyan,
-            bg: :none,
-        },
+  mvn2: {
+    time: {
+      fg: :green,
+      bg: :none
+    },
+    percent: {
+      fg: :purple,
+      bg: :none
+    },
+    average: {
+      fg: :cyan,
+      bg: :none
+    }
+  },
+  mvr: {
+    normal: {
+      fg: :none,
+      bg: :none
     },
-    mvr:  {
-        normal:   {
-            fg: :none,
-            bg: :none,
-        },
-        same:     {
-            fg: :black,
-            bg: :white,
-        },
-        conflict: {
-            fg: :white,
-            bg: :red,
-        },
+    same: {
+      fg: :black,
+      bg: :white
     },
+    conflict: {
+      fg: :white,
+      bg: :red
+    }
+  }
 }
 
 colors = [:black, :red, :green, :yellow, :blue, :purple, :cyan, :white, :none]
 
-while true
-
-  Ask::ask('Which script do you want to configure colors for?', [:mvn2, :mvr, :Exit]) { |script|
-    if script == :Exit
-      exit(0)
-    end
+loop do
+  Ask.ask('Which script do you want to configure colors for?', Ask.hash_to_options(config_files, [:Exit])) { |script|
+    exit(0) if script == :Exit
 
     config_file = File.expand_path(config_files[script])
 
     options = Marshal.load(Marshal.dump(default_options[script]))
 
-    if File.exist?(config_file)
-      options = YAML::load_file(config_file)
-    end
+    options = YAML.load_file(config_file) if File.exist?(config_file)
 
     brk = false
     until brk
-      Ask::ask('Which config option do you want?', Ask::hash_to_options(options, [:Save, :'Up a level', :Exit])) { |opt|
-        if opt == :Exit
-          exit(0)
-        elsif opt == :'Up a level'
+      Ask.ask('Which config option do you want?', Ask.hash_to_options(options, [:Save, :'Up a level', :Exit])) { |opt|
+        exit(0) if opt == :Exit
+        if opt == :'Up a level'
           brk = true
         elsif opt == :Save
           IO.write(config_file, options.to_yaml)
@@ -73,13 +91,12 @@ while true
         else
           brk2 = false
           until brk2
-            Ask::ask("Configuring: #{opt.to_s}\nWhich color do you want to set?", Ask::hash_to_options(options[opt], [:'Up a level', :Exit])) { |which|
-              if which == :Exit
-                exit(0)
-              elsif which == :'Up a level'
+            Ask.ask("Configuring: #{opt}\nWhich color do you want to set?", Ask.hash_to_options(options[opt], [:'Up a level', :Exit])) { |which|
+              exit(0) if which == :Exit
+              if which == :'Up a level'
                 brk2 = true
               else
-                Ask::ask("Configuring: #{opt.to_s} -> #{which.to_s} (currently: #{options[opt][which].to_s}) (default: #{default_options[script][opt][which].to_s})\nWhich color do you want?", colors + [:Default, :Cancel]) { |color|
+                Ask.ask("Configuring: #{opt} -> #{which} (currently: #{options[opt][which]}) (default: #{default_options[script][opt][which]})\nWhich color do you want?", colors + [:Default, :Cancel]) { |color|
                   unless color == :Cancel
                     options[opt][which] = (color == :Default) ? default_options[script][opt][which] : color
                   end

data/lib/colorconfig/version.rb

@@ -1,3 +1,3 @@
 module Colorconfig
-  VERSION = '2.2.2'
+  VERSION = '2.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorconfig
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Eric Henderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,8 +111,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: color configuration
 test_files: []
+has_rdoc: