spout 0.14.0.beta1 → 0.14.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70dea3c7337f2cfc3a38c1e59b5c8e9c94b7b009800b2680a3dcb06513331255
-  data.tar.gz: 4e63bf76cdbf26f4c4f387f15b454457a3e8a85677215f226b9060de38623072
+  metadata.gz: 18d01986890a2541efb2384e382e786959e53618c65f5dbe5f75ac8ee0dd7e68
+  data.tar.gz: a2ea53c30b10f2f6a756a5ee8452bb9417ac7d8b5571f91fedf654a9eaa89914
 SHA512:
-  metadata.gz: 542a18cc6f5e34c7df0f9ee1e7a848643bdb1e575176013fe1117becd81f715f32ca77ab150964b39aa66e3e76432d137e32b012680bc7d1f3b41e3435ac58f1
-  data.tar.gz: b85ffc0d3bba23f6af803c9d99ca47da3ac517ec840fd3d33f3c08d2a393067e68198de02f458f45cc206138f024151290b943746748cc7c55b86e4766670a35
+  metadata.gz: 5e1a15e77e49767460be60264678e25629c35f904bb080fb744bbe3da423fe8f338d358d7aa77b30951f436d8abcc5f894e6bbe503d5a9b2991087736150497f
+  data.tar.gz: 68e75df0a0ebbdfeb9d15f08ecb2ae86591512bd3f4babd4ea4512a17fc161fc253ffbdc7678727bf1ae78416497117b7659e3160700daa839d7a07967b490d3

data/CHANGELOG.md

@@ -4,6 +4,7 @@
 - **Framework Changes**
   - Spout data dictionaries can now specify gem dependencies using `gems.rb`
     instead of `Gemfile`
+  - Removed dependency on colorize gem
 - **Test Changes**
   - Improved the spout testing framework
     - Tests are now run excusively using `spout t` command

data/README.md

@@ -188,9 +188,9 @@ class DictionaryTest < Minitest::Test
 
   @variables.select { |v| %w(numeric integer).include?(v.type) }.each do |variable|
     define_method("test_units: #{variable.path}") do
-      message = "\"#{variable.units}\"".colorize(:red) + " invalid units.\n" +
+      message = "\"#{variable.units}\"".red + " invalid units.\n" +
                 "             Valid types: " +
-                VALID_UNITS.sort_by(&:to_s).collect { |u| u.inspect.colorize(:white) }.join(", ")
+                VALID_UNITS.sort_by(&:to_s).collect { |u| u.inspect.white }.join(", ")
       assert VALID_UNITS.include?(variable.units), message
     end
   end

data/lib/spout/color.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+# Adds ANSI colors to string class.
+class String
+  def black
+    "\e[30m#{self}\e[0m"
+  end
+
+  def red
+    "\e[31m#{self}\e[0m"
+  end
+
+  def green
+    "\e[32m#{self}\e[0m"
+  end
+
+  def brown
+    "\e[33m#{self}\e[0m"
+  end
+
+  def yellow
+    brown
+  end
+
+  def blue
+    "\e[34m#{self}\e[0m"
+  end
+
+  def magenta
+    "\e[35m#{self}\e[0m"
+  end
+
+  def cyan
+    "\e[36m#{self}\e[0m"
+  end
+
+  def gray
+    "\e[37m#{self}\e[0m"
+  end
+
+  def white
+    "\e[39m#{bold}\e[0m"
+  end
+
+  def bg_black
+    "\e[40m#{self}\e[0m"
+  end
+
+  def bg_red
+    "\e[41m#{self}\e[0m"
+  end
+
+  def bg_green
+    "\e[42m#{self}\e[0m"
+  end
+
+  def bg_brown
+    "\e[43m#{self}\e[0m"
+  end
+
+  def bg_blue
+    "\e[44m#{self}\e[0m"
+  end
+
+  def bg_magenta
+    "\e[45m#{self}\e[0m"
+  end
+
+  def bg_cyan
+    "\e[46m#{self}\e[0m"
+  end
+
+  def bg_gray
+    "\e[47m#{self}\e[0m"
+  end
+
+  def bold
+    "\e[1m#{self}\e[22m"
+  end
+
+  def italic
+    "\e[3m#{self}\e[23m"
+  end
+
+  def underline
+    "\e[4m#{self}\e[24m"
+  end
+
+  def blink
+    "\e[5m#{self}\e[25m"
+  end
+
+  def reverse_color
+    "\e[7m#{self}\e[27m"
+  end
+
+  def colorless
+    gsub(/\e\[\d{1,2}m/, "")
+  end
+end

data/lib/spout/commands/deploy.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "colorize"
 require "net/http"
 require "io/console"
 
@@ -77,7 +76,7 @@ module Spout
         begin
           run_all
         rescue Interrupt
-          puts "\nINTERRUPTED".colorize(:red)
+          puts "\nINTERRUPTED".red
         end
       end
 
@@ -104,21 +103,21 @@ module Spout
         @slug = @config.slug
 
         if @slug == ""
-          message = "#{INDENT}Please specify a dataset slug in your `.spout.yml` file!".colorize(:red) + " Ex:\n---\nslug: mydataset\n".colorize(:orange)
+          message = "#{INDENT}Please specify a dataset slug in your `.spout.yml` file!".red + " Ex:\n---\nslug: mydataset\n".gray
           failure(message)
         end
 
         if @config.webservers.empty?
-          message = "#{INDENT}Please specify a webserver in your `.spout.yml` file!".colorize(:red) + " Ex:\n---\nwebservers:\n  - name: production\n    url: https://sleepdata.org\n  - name: staging\n    url: https://staging.sleepdata.org\n".colorize(:orange)
+          message = "#{INDENT}Please specify a webserver in your `.spout.yml` file!".red + " Ex:\n---\nwebservers:\n  - name: production\n    url: https://sleepdata.org\n  - name: staging\n    url: https://staging.sleepdata.org\n".gray
           failure(message)
         end
 
         matching_webservers = @config.webservers.select { |wh| /^#{@environment}/i =~ wh["name"].to_s.downcase }
         if matching_webservers.count == 0
-          message = "#{INDENT}0 webservers match '#{@environment}'.".colorize(:red) + " The following webservers exist in your `.spout.yml` file:\n" + "#{INDENT}#{@config.webservers.collect{|wh| wh['name'].to_s.downcase}.join(', ')}".colorize(:white)
+          message = "#{INDENT}0 webservers match '#{@environment}'.".red + " The following webservers exist in your `.spout.yml` file:\n" + "#{INDENT}#{@config.webservers.collect{|wh| wh['name'].to_s.downcase}.join(', ')}".white
           failure(message)
         elsif matching_webservers.count > 1
-          message = "#{INDENT}#{matching_webservers.count} webservers match '#{@environment}'.".colorize(:red) + " Did you mean one of the following?\n" + "#{INDENT}#{matching_webservers.collect{|wh| wh['name'].to_s.downcase}.join(', ')}".colorize(:white)
+          message = "#{INDENT}#{matching_webservers.count} webservers match '#{@environment}'.".red + " Did you mean one of the following?\n" + "#{INDENT}#{matching_webservers.collect{|wh| wh['name'].to_s.downcase}.join(', ')}".white
           failure(message)
         end
 
@@ -126,13 +125,13 @@ module Spout
         @url = URI.parse(matching_webservers.first["url"].to_s.strip) rescue @url = nil
 
         if @url.to_s == ""
-          message = "#{INDENT}Invalid URL format for #{matching_webservers.first['name'].to_s.strip.downcase} webserver: ".colorize(:red) + "'#{matching_webservers.first['url'].to_s.strip}'".colorize(:white)
+          message = "#{INDENT}Invalid URL format for #{matching_webservers.first['name'].to_s.strip.downcase} webserver: ".red + "'#{matching_webservers.first['url'].to_s.strip}'".white
           failure(message)
         end
 
-        puts "PASS".colorize(:green)
-        puts "        Target Server: " + "#{@url}".colorize(:white)
-        puts "       Target Dataset: " + "#{@slug}".colorize(:white)
+        puts "PASS".green
+        puts "        Target Server: " + "#{@url}".white
+        puts "       Target Dataset: " + "#{@slug}".white
       end
 
       # - **Version Check**
@@ -141,7 +140,7 @@ module Spout
       #   - "v#{VERSION}" matches HEAD git tag annotation
       def version_check
         if @skip_checks
-          puts "        Version Check: " + "SKIP".colorize(:blue)
+          puts "        Version Check: " + "SKIP".blue
           return
         end
 
@@ -151,19 +150,19 @@ module Spout
 
         print "     Git Status Check: "
         if stdout.to_s.strip == ""
-          puts "PASS".colorize(:green) + " " + "nothing to commit, working directory clean".colorize(:white)
+          puts "PASS".green + " " + "nothing to commit, working directory clean".white
         else
-          message = "#{INDENT}working directory contains uncomitted changes\n#{INDENT}use `".colorize(:red) + "--skip-checks".colorize(:white) + "` to ignore this step".colorize(:red)
+          message = "#{INDENT}working directory contains uncomitted changes\n#{INDENT}use `".red + "--skip-checks".white + "` to ignore this step".red
           failure message
         end
 
         changelog = File.open("CHANGELOG.md", &:readline).strip rescue changelog = ""
         if changelog.match(/^## #{@version.split('.')[0..2].join('.')}/)
-          puts "         CHANGELOG.md: " + "PASS".colorize(:green) + " " + changelog.colorize(:white)
+          puts "         CHANGELOG.md: " + "PASS".green + " " + changelog.white
         else
           print "         CHANGELOG.md: "
-          message = "#{INDENT}Expected: ".colorize(:red) + "## #{@version}".colorize(:white) +
-                  "\n#{INDENT}  Actual: ".colorize(:red) + changelog.colorize(:white)
+          message = "#{INDENT}Expected: ".red + "## #{@version}".white +
+                  "\n#{INDENT}  Actual: ".red + changelog.white
           failure message
         end
 
@@ -174,16 +173,16 @@ module Spout
         print "        Version Check: "
         tag = stdout.to_s.strip
         if "v#{@version}" != tag
-          message = "#{INDENT}Version specified in `VERSION` file ".colorize(:red) + "'v#{@version}'".colorize(:white) + " does not match git tag on HEAD commit ".colorize(:red) + "'#{tag}'".colorize(:white)
+          message = "#{INDENT}Version specified in `VERSION` file ".red + "'v#{@version}'".white + " does not match git tag on HEAD commit ".red + "'#{tag}'".white
           failure message
         else
-          puts "PASS".colorize(:green) + " VERSION " + "'v#{@version}'".colorize(:white) + " matches git tag " + "'#{tag}'".colorize(:white)
+          puts "PASS".green + " VERSION " + "'v#{@version}'".white + " matches git tag " + "'#{tag}'".white
         end
       end
 
       def test_check
         if @skip_tests
-          puts "          Spout Tests: " + "SKIP".colorize(:blue)
+          puts "          Spout Tests: " + "SKIP".blue
           return
         end
 
@@ -194,31 +193,31 @@ module Spout
         end
 
         if stdout.match(/[^\d]0 failures, 0 errors,/)
-          puts "PASS".colorize(:green)
+          puts "PASS".green
         else
-          message = "#{INDENT}spout t".colorize(:white) + " had errors or failures".colorize(:red) + "\n#{INDENT}Please fix all errors and failures and then run spout deploy again."
+          message = "#{INDENT}spout t".white + " had errors or failures".red + "\n#{INDENT}Please fix all errors and failures and then run spout deploy again."
           failure message
         end
       end
 
       def coverage_check
         if @skip_coverage
-          puts "     Dataset Coverage: " + "SKIP".colorize(:blue)
+          puts "     Dataset Coverage: " + "SKIP".blue
           return
         end
 
-        puts "     Dataset Coverage: " + "NOT IMPLEMENTED".colorize(:yellow)
+        puts "     Dataset Coverage: " + "NOT IMPLEMENTED".yellow
       end
 
       def user_authorization
-        puts  "  Get your token here: " + "#{@url}/token".colorize(:blue).on_white.underline
+        puts  "  Get your token here: " + "#{@url}/token".blue.bg_gray.underline
         print "     Enter your token: "
         @token = STDIN.noecho(&:gets).chomp if @token.to_s.strip == ""
         (json, _status) = Spout::Helpers::JsonRequest.get("#{@url}/datasets/#{@slug}/a/#{@token}/editor.json")
         if json.is_a?(Hash) && json["editor"]
-          puts "AUTHORIZED".colorize(:green)
+          puts "AUTHORIZED".green
         else
-          puts "UNAUTHORIZED".colorize(:red)
+          puts "UNAUTHORIZED".red
           puts "#{INDENT}You are not set as an editor on the #{@slug} dataset or you mistyped your token."
           raise DeployError
         end
@@ -226,7 +225,7 @@ module Spout
 
       def upload_variables
         if @skip_variables
-          puts "     Upload Variables: " + "SKIP".colorize(:blue)
+          puts "     Upload Variables: " + "SKIP".blue
           return
         end
         load_subjects_from_csvs
@@ -246,12 +245,12 @@ module Spout
         require "spout/commands/graphs"
         @argv << "--clean" if @clean
         Spout::Commands::Graphs.new(@argv, @version, true, @url, @slug, @token, @webserver_name, @subjects)
-        puts "\r     Upload Variables: " + "DONE          ".colorize(:green)
+        puts "\r     Upload Variables: " + "DONE          ".green
       end
 
       def dataset_uploads
         if @skip_dataset
-          puts "      Dataset Uploads: " + "SKIP".colorize(:blue)
+          puts "      Dataset Uploads: " + "SKIP".blue
           return
         end
 
@@ -261,7 +260,7 @@ module Spout
         csv_files = Dir.glob("csvs/#{csv_directory}/**/*.csv")
 
         csv_files.each_with_index do |csv_file, index|
-          print "\r      Dataset Uploads: " + "#{index + 1} of #{csv_files.count}".colorize(:green)
+          print "\r      Dataset Uploads: " + "#{index + 1} of #{csv_files.count}".green
           folder = csv_file.gsub(%r{^csvs/#{csv_directory}}, "").gsub(/#{File.basename(csv_file)}$/, "")
           folder = folder.gsub(%r{/$}, "")
           @created_folders << "datasets#{folder}"
@@ -270,12 +269,12 @@ module Spout
           upload_file(csv_file, "datasets#{folder}") unless @archive_only
           upload_file(csv_file, "datasets/archive/#{@version}#{folder}")
         end
-        puts "\r      Dataset Uploads: " + "DONE          ".colorize(:green)
+        puts "\r      Dataset Uploads: " + "DONE          ".green
       end
 
       def data_dictionary_uploads
         if @skip_dictionary
-          puts "   Dictionary Uploads: " + "SKIP".colorize(:blue)
+          puts "   Dictionary Uploads: " + "SKIP".blue
           return
         end
 
@@ -286,38 +285,38 @@ module Spout
 
         csv_files = Dir.glob("exports/#{@version}/*.csv")
         csv_files.each_with_index do |csv_file, index|
-          print "\r   Dictionary Uploads: " + "#{index + 1} of #{csv_files.count}".colorize(:green)
+          print "\r   Dictionary Uploads: " + "#{index + 1} of #{csv_files.count}".green
           @created_folders << "datasets"
           @created_folders << "datasets/archive"
           @created_folders << "datasets/archive/#{@version}"
           upload_file(csv_file, "datasets") unless @archive_only
           upload_file(csv_file, "datasets/archive/#{@version}")
         end
-        puts "\r   Dictionary Uploads: " + "DONE          ".colorize(:green)
+        puts "\r   Dictionary Uploads: " + "DONE          ".green
       end
 
       def markdown_uploads
         if @skip_documentation
-          puts "Documentation Uploads: " + "SKIP".colorize(:blue)
+          puts "Documentation Uploads: " + "SKIP".blue
           return
         end
 
         print "Documentation Uploads:"
         markdown_files = Dir.glob(%w(CHANGELOG.md KNOWNISSUES.md))
         markdown_files.each_with_index do |markdown_file, index|
-          print "\rDocumentation Uploads: " + "#{index + 1} of #{markdown_files.count}".colorize(:green)
+          print "\rDocumentation Uploads: " + "#{index + 1} of #{markdown_files.count}".green
           @created_folders << "datasets"
           @created_folders << "datasets/archive"
           @created_folders << "datasets/archive/#{@version}"
           upload_file(markdown_file, "datasets") unless @archive_only
           upload_file(markdown_file, "datasets/archive/#{@version}")
         end
-        puts "\rDocumentation Uploads: " + "DONE          ".colorize(:green)
+        puts "\rDocumentation Uploads: " + "DONE          ".green
       end
 
       def trigger_server_updates
         if @skip_server_scripts
-          puts "Launch Server Scripts: " + "SKIP".colorize(:blue)
+          puts "Launch Server Scripts: " + "SKIP".blue
           return
         end
 
@@ -325,16 +324,16 @@ module Spout
         params = { auth_token: @token, dataset: @slug, version: @version, folders: @created_folders.compact.uniq }
         (json, _status) = Spout::Helpers::JsonRequest.post("#{@url}/api/v1/dictionary/refresh.json", params)
         if json.is_a?(Hash) && json["refresh"] == "success"
-          puts "DONE".colorize(:green)
+          puts "DONE".green
         else
-          puts "FAIL".colorize(:red)
+          puts "FAIL".red
           raise DeployError
         end
       end
 
       def set_default_dataset_version
         if @archive_only
-          puts "  Set Default Version: " + "SKIP".colorize(:blue)
+          puts "  Set Default Version: " + "SKIP".blue
           return
         end
         print "  Set Default Version: "
@@ -343,14 +342,14 @@ module Spout
           "#{@url}/api/v1/dictionary/update_default_version.json", params
         )
         if json.is_a?(Hash) && json["version_update"] == "success"
-          puts @version.to_s.colorize(:green)
+          puts @version.to_s.green
         else
-          failure("#{INDENT}Unable to set default version\n#{INDENT}to " + @version.to_s.colorize(:white) + " for " + @slug.to_s.colorize(:white) + " dataset.")
+          failure("#{INDENT}Unable to set default version\n#{INDENT}to " + @version.to_s.white + " for " + @slug.to_s.white + " dataset.")
         end
       end
 
       def failure(message)
-        puts "FAIL".colorize(:red)
+        puts "FAIL".red
         puts message
         raise DeployError
       end

data/lib/spout/commands/exporter.rb

@@ -3,7 +3,6 @@
 require "csv"
 require "json"
 require "fileutils"
-require "colorize"
 
 require "spout/helpers/config_reader"
 
@@ -22,7 +21,7 @@ module Spout
 
       def expanded_export!
         folder = "exports/#{@standard_version}"
-        puts "      create".colorize(:green) + "  #{folder}" unless @quiet
+        puts "      create".green + "  #{folder}" unless @quiet
         FileUtils.mkpath folder
         generic_export(
           folder,
@@ -38,7 +37,7 @@ module Spout
 
       def generic_export(folder, type, keys, include_domain_name = false)
         export_file = export_file_name(type)
-        puts "      export".colorize(:blue) + "  #{folder}/#{export_file}" unless @quiet
+        puts "      export".blue + "  #{folder}/#{export_file}" unless @quiet
         CSV.open("#{folder}/#{export_file}", "wb") do |csv|
           csv << if include_domain_name
                    %w(folder domain_id) + keys

data/lib/spout/commands/graphs.rb

@@ -5,7 +5,6 @@ require "fileutils"
 require "rubygems"
 require "json"
 require "yaml"
-require "colorize"
 
 require "spout/helpers/subject_loader"
 require "spout/helpers/chart_types"
@@ -109,7 +108,7 @@ module Spout
           next unless Spout::Models::Subject.method_defined?(variable.id)
 
           if @deploy_mode
-            print "\r     Upload Variables: " + "#{"% 3d" % ((file_index+1)*100/variable_files_count)}% Uploaded".colorize(:white)
+            print "\r     Upload Variables: " + "#{"% 3d" % ((file_index+1)*100/variable_files_count)}% Uploaded".white
           else
             puts "#{file_index + 1} of #{variable_files_count}: #{variable.folder}#{variable.id}"
           end
@@ -180,7 +179,7 @@ module Spout
         if json.is_a?(Hash) && status.is_a?(Net::HTTPSuccess)
           @progress[variable.id]["uploaded"] << @webserver_name
         else
-          puts "\nUPLOAD FAILED: ".colorize(:red) + variable.id
+          puts "\nUPLOAD FAILED: ".red + variable.id
           puts "- Error: #{json.inspect}"
         end
       end

data/lib/spout/commands/help.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "colorize"
-
 module Spout
   module Commands
     class Help

data/lib/spout/commands/importer.rb

@@ -2,7 +2,6 @@
 
 require "json"
 require "fileutils"
-require "colorize"
 
 require "spout/helpers/csv_reader"
 
@@ -41,7 +40,7 @@ EOT
       def import_variables
         Spout::Helpers::CSVReader.read_csv(@csv_file) do |row|
           if not row.keys.include?("id")
-            puts "\nMissing column header `".colorize( :red ) + "id".colorize( :light_cyan ) + "` in data dictionary.".colorize( :red ) + additional_csv_info
+            puts "\nMissing column header `".red + "id".cyan + "` in data dictionary.".red + additional_csv_info
             exit(1)
           end
           next if row["id"] == ""
@@ -70,7 +69,7 @@ EOT
           File.open(file_name, "w") do |file|
             file.write(JSON.pretty_generate(hash) + "\n")
           end
-          puts "      create".colorize( :green ) + "  #{file_name}"
+          puts "      create".green + "  #{file_name}"
         end
       end
 
@@ -79,15 +78,15 @@ EOT
 
         Spout::Helpers::CSVReader.read_csv(@csv_file) do |row|
           if not row.keys.include?("domain_id")
-            puts "\nMissing column header `".colorize( :red ) + "domain_id".colorize( :light_cyan ) + "` in data dictionary.".colorize( :red ) + additional_csv_info
+            puts "\nMissing column header `".red + "domain_id".cyan + "` in data dictionary.".red + additional_csv_info
             exit(1)
           end
           if not row.keys.include?("value")
-            puts "\nMissing column header `".colorize( :red ) + "value".colorize( :light_cyan ) + "` in data dictionary.".colorize( :red ) + additional_csv_info
+            puts "\nMissing column header `".red + "value".cyan + "` in data dictionary.".red + additional_csv_info
             exit(1)
           end
           if not row.keys.include?("display_name")
-            puts "\nMissing column header `".colorize( :red ) + "display_name".colorize( :light_cyan ) + "` in data dictionary.".colorize( :red ) + additional_csv_info
+            puts "\nMissing column header `".red + "display_name".cyan + "` in data dictionary.".red + additional_csv_info
             exit(1)
           end
 
@@ -116,23 +115,23 @@ EOT
           File.open(file_name, "w") do |file|
             file.write(JSON.pretty_generate(domain_hash["options"]) + "\n")
           end
-          puts "      create".colorize( :green ) + "  #{file_name}"
+          puts "      create".green + "  #{file_name}"
         end
       end
 
       def import_forms
         Spout::Helpers::CSVReader.read_csv(@csv_file) do |row|
           unless row.keys.include?("id")
-            puts "\nMissing column header `".colorize(:red) +
-                 "id".colorize(:light_cyan) +
-                 "` in data dictionary.".colorize(:red) +
+            puts "\nMissing column header `".red +
+                 "id".cyan +
+                 "` in data dictionary.".red +
                  additional_csv_info
             exit(1)
           end
           unless row.keys.include?("display_name")
-            puts "\nMissing column header `".colorize(:red) +
-                 "display_name".colorize(:light_cyan) +
-                 "` in data dictionary.".colorize(:red) +
+            puts "\nMissing column header `".red +
+                 "display_name".cyan +
+                 "` in data dictionary.".red +
                  additional_csv_info
             exit(1)
           end
@@ -149,7 +148,7 @@ EOT
           File.open(file_name, "w") do |file|
             file.write(JSON.pretty_generate(hash) + "\n")
           end
-          puts "      create".colorize(:green) + "  #{file_name}"
+          puts "      create".green + "  #{file_name}"
         end
       end
 
@@ -169,7 +168,7 @@ EOT
 
       def additional_csv_info
         "\n\nFor additional information on specifying CSV column headers before import see:\n\n    " +
-          "https://github.com/sleepepi/spout#generate-a-new-repository-from-an-existing-csv-file".colorize(:light_cyan) + "\n\n"
+          "https://github.com/sleepepi/spout#generate-a-new-repository-from-an-existing-csv-file".cyan + "\n\n"
       end
     end
   end

data/lib/spout/commands/project_generator.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "colorize"
 require "fileutils"
 
 require "spout/helpers/framework"
@@ -49,7 +48,7 @@ EOT
         copy_file "test/dictionary_test.rb"
         copy_file "test/test_helper.rb"
         return if skip_gemfile
-        puts "         run".colorize(:green) + "  bundle install".colorize(:light_cyan)
+        puts "         run".green + "  bundle install".cyan
         Dir.chdir(@full_path)
         system "bundle install"
       end

data/lib/spout/commands/update.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "colorize"
 require "spout/helpers/json_request"
 require "spout/helpers/framework"
 
@@ -24,19 +23,19 @@ module Spout
         (json, _status) = Spout::Helpers::JsonRequest.get("https://rubygems.org/api/v1/gems/spout.json")
         if json
           if json["version"] == Spout::VERSION::STRING
-            puts "The spout gem is " + "up-to-date".colorize(:green) + "!"
+            puts "The spout gem is " + "up-to-date".green + "!"
             check_framework if File.exist?("Gemfile") || File.exist?("gems.rb")
           else
             puts "A newer version (v#{json["version"]}) is available!\n\n"
             if File.exist?("gems.rb")
-              puts "Add the following to gems.rb and run " + "bundle update".colorize(:green) + ".\n\n"
-              puts "  gem \"spout\", \"~> #{json["version"]}\"\n".colorize(:white)
+              puts "Add the following to gems.rb and run " + "bundle update".green + ".\n\n"
+              puts "  gem \"spout\", \"~> #{json["version"]}\"\n".white
             elsif File.exist?("Gemfile")
-              puts "Add the following to Gemfile and run " + "bundle update".colorize(:green) + ".\n\n"
-              puts "  gem \"spout\", \"~> #{json["version"]}\"\n".colorize(:white)
+              puts "Add the following to Gemfile and run " + "bundle update".green + ".\n\n"
+              puts "  gem \"spout\", \"~> #{json["version"]}\"\n".white
             else
               puts "Type the following command to update:\n\n"
-              puts "  gem install spout --no-document".colorize(:white) + "\n\n"
+              puts "  gem install spout --no-document".white + "\n\n"
             end
           end
         else
@@ -58,13 +57,13 @@ module Spout
           addables = ["/coverage", "/csvs", "/exports", "/graphs"]
           removables = ["/dd", "/images"]
           unless ((removables & lines) | (addables - lines)).empty?
-            puts "File: " + ".gitignore".colorize(:white)
+            puts "File: " + ".gitignore".white
             puts "----------------"
             (removables & lines).each do |removable|
-              puts "REMOVE LINE ".colorize(:red) + removable.colorize(:white)
+              puts "REMOVE LINE ".red + removable.white
             end
             (addables - lines).each do |addable|
-              puts "   ADD LINE ".colorize(:green) + addable.colorize(:white)
+              puts "   ADD LINE ".green + addable.white
             end
             puts
           end
@@ -78,10 +77,10 @@ module Spout
           lines = IO.readlines(".ruby-version").collect(&:strip)
           template_lines = IO.readlines(File.expand_path("../../templates/ruby-version", __FILE__)).collect(&:strip)
           if template_lines.first != lines.first
-            puts "File: " + ".ruby-version".colorize(:white)
+            puts "File: " + ".ruby-version".white
             puts "-------------------"
-            print "Update Ruby from " + lines.first.to_s.colorize(:red)
-            print " to " + template_lines.first.to_s.colorize(:green)
+            print "Update Ruby from " + lines.first.to_s.red
+            print " to " + template_lines.first.to_s.green
             puts "\n\n"
           end
         else

data/lib/spout/helpers/framework.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "colorize"
 require "date"
 require "erb"
 require "fileutils"
@@ -15,7 +14,7 @@ module Spout
         file_name = template_file if file_name == ""
         file_path = File.join(@full_path, file_name)
         template_file_path = File.join(TEMPLATES_DIRECTORY, template_file)
-        puts "      create".colorize(:green) + "  #{file_name}"
+        puts "      create".green + "  #{file_name}"
         FileUtils.copy(template_file_path, file_path)
       end
 
@@ -25,14 +24,14 @@ module Spout
         file_path = File.join(@full_path, file_name)
         file_out = File.new(file_path, "w")
         file_out.syswrite(template.result(binding))
-        puts "      create".colorize(:green) + "  #{file_name}"
+        puts "      create".green + "  #{file_name}"
       ensure
         file_out.close if file_out
       end
 
       def directory(directory_name)
         directory_path = File.join(@full_path, directory_name)
-        puts "      create".colorize(:green) + "  #{directory_name}"
+        puts "      create".green + "  #{directory_name}"
         FileUtils.mkpath(directory_path)
       end
     end

data/lib/spout/helpers/json_request.rb

@@ -36,7 +36,7 @@ module Spout
         end
       rescue
         @error = "Invalid URL: #{url.inspect}"
-        puts @error.colorize(:red)
+        puts @error.red
       end
 
       def get
@@ -49,7 +49,7 @@ module Spout
         end
         [JSON.parse(response.body), response]
       rescue => e
-        puts "GET Error: #{e}".colorize(:red)
+        puts "GET Error: #{e}".red
       end
 
       def post
@@ -59,7 +59,7 @@ module Spout
         end
         [JSON.parse(response.body), response]
       rescue => e
-        puts "POST ERROR: #{e}".colorize(:red)
+        puts "POST ERROR: #{e}".red
         nil
       end
 

data/lib/spout/helpers/subject_loader.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "colorize"
 require "json"
 
 require "spout/helpers/csv_reader"
@@ -45,9 +44,9 @@ module Spout
         @csv_files = Dir.glob("#{csv_root}/**/*.csv").sort
 
         if @csv_directory != @standard_version
-          puts "\n#{@csv_files.size == 0 ? 'No CSVs found' : 'Parsing files' } in " + "#{csv_root}".colorize(:white) + " for dictionary version " + @standard_version.to_s.colorize(:green) + "\n"
+          puts "\n#{@csv_files.size == 0 ? 'No CSVs found' : 'Parsing files' } in " + "#{csv_root}".white + " for dictionary version " + @standard_version.to_s.green + "\n"
         else
-          puts "\n#{@csv_files.size == 0 ? 'No CSVs found' : 'Parsing files' } in " + "#{csv_root}".colorize(:white) + "\n"
+          puts "\n#{@csv_files.size == 0 ? 'No CSVs found' : 'Parsing files' } in " + "#{csv_root}".white + "\n"
         end
 
         last_folder = nil
@@ -56,13 +55,13 @@ module Spout
           current_file = File.basename(relative_path)
           current_folder = relative_path.gsub(/#{current_file}$/, "")
           count = 1 # Includes counting the header row
-          puts "  #{current_folder}".colorize(:white) if current_folder.to_s != "" && current_folder != last_folder
+          puts "  #{current_folder}".white if current_folder.to_s != "" && current_folder != last_folder
           print "    #{current_file}"
           last_folder = current_folder
 
           Spout::Helpers::CSVReader.read_csv(csv_file) do |row|
             count += 1
-            print "\r    #{current_file} " + "##{count}".colorize(:yellow) if (count % 10 == 0)
+            print "\r    #{current_file} " + "##{count}".yellow if (count % 10 == 0)
             @subjects << Spout::Models::Subject.create do |t|
               t._visit = row[@visit]
               t._csv = File.basename(csv_file)
@@ -70,7 +69,7 @@ module Spout
               row.each_with_index do |(key, value), index|
                 method = key.to_s.downcase.strip
                 if method == ""
-                  puts "\nSkipping column #{index + 1} due to blank header.".colorize(:red) if count == 2
+                  puts "\nSkipping column #{index + 1} due to blank header.".red if count == 2
                   next
                 end
                 next unless @valid_ids.include?(method) || @valid_ids.size == 0
@@ -91,7 +90,7 @@ module Spout
             break if !@number_of_rows.nil? && count - 1 >= @number_of_rows
           end
 
-          print "\r    #{current_file} " + "##{count}".colorize(:green)
+          print "\r    #{current_file} " + "##{count}".green
           puts "\n"
         end
       end

data/lib/spout/templates/test/dictionary_test.rb

@@ -17,9 +17,9 @@ class DictionaryTest < Minitest::Test
   # VALID_UNITS = ["minutes", "hours"]
   # @variables.select { |v| %w(numeric integer).include?(v.type) }.each do |variable|
   #   define_method("test_units: #{variable.path}") do
-  #     message = "\"#{variable.units}\"".colorize(:red) + " invalid units.\n" +
+  #     message = "\"#{variable.units}\"".red + " invalid units.\n" +
   #               "             Valid types: " +
-  #               VALID_UNITS.sort_by(&:to_s).collect { |u| u.inspect.colorize(:white) }.join(", ")
+  #               VALID_UNITS.sort_by(&:to_s).collect { |u| u.inspect.white }.join(", ")
   #     assert VALID_UNITS.include?(variable.units), message
   #   end
   # end

data/lib/spout/tests.rb

@@ -5,7 +5,6 @@ require "json"
 
 require "minitest/autorun"
 require "minitest/reporters"
-require "colorize"
 
 module Minitest
   module Reporters
@@ -14,10 +13,7 @@ module Minitest
 
       def start
         super
-        print "Loaded Suite test".colorize(:white)
-        puts
-        puts
-        puts "Started"
+        puts "Started spout tests".white
         puts
       end
 
@@ -25,11 +21,11 @@ module Minitest
         super
         puts format("Finished in %.5f seconds.", total_time)
         puts
-        print format("%d tests", count).colorize(:white)
+        print format("%d tests", count).white
         print format(", %d assertions, ", assertions)
         color = failures.zero? && errors.zero? ? :green : :red
-        print format("%d failures, %d errors, ", failures, errors).colorize(color)
-        print format("%d skips", skips).colorize(:yellow)
+        print format("%d failures, %d errors, ", failures, errors).send(color)
+        print format("%d skips", skips).yellow
         puts
         puts
       end
@@ -58,7 +54,7 @@ module Minitest
                 else
                   :red
                 end
-        print pad_mark(result(test).to_s.upcase).colorize(color)
+        print pad_mark(result(test).to_s.upcase).send(color)
       end
 
       def before_suite(suite)
@@ -111,6 +107,3 @@ module Spout
     include Spout::Tests::VariableTypeValidation
   end
 end
-
-# Initialize the String class `@disable_colorization` instance variable
-String.disable_colorization = false

data/lib/spout/version.rb

@@ -5,7 +5,7 @@ module Spout
     MAJOR = 0
     MINOR = 14
     TINY = 0
-    BUILD = "beta1" # "pre", "rc", "rc2", nil
+    BUILD = "beta2" # "pre", "rc", "rc2", nil
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join(".").freeze
   end

data/lib/spout.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spout/version"
+require "spout/color"
 
 require "spout/models/dictionary"
 

data/spout.gemspec

@@ -40,5 +40,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency "minitest"
   spec.add_dependency "minitest-reporters"
   spec.add_dependency "json"
-  spec.add_dependency "colorize", "~> 0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.14.0.beta1
+  version: 0.14.0.beta2
 platform: ruby
 authors:
 - Remo Mueller
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.1
 description: Manage your data dictionary as a JSON repository, and easily export back
   to CSV.
 email:
@@ -95,6 +81,7 @@ files:
 - Rakefile
 - bin/spout
 - lib/spout.rb
+- lib/spout/color.rb
 - lib/spout/commands/coverage.rb
 - lib/spout/commands/deploy.rb
 - lib/spout/commands/exporter.rb