colorly 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 572649998dd2a43148239699a5c95c418d38860f7a89bc15ccba507b1414acab
-  data.tar.gz: 062e72d51fe3fc1c61a1f4e3a8e2da95c5f4da8883a7ddd80c4a79639cb93ef0
+  metadata.gz: 5bc17faf47ed2bd97906a27fed720be247a22294664ba36e7866ae39dde3897f
+  data.tar.gz: 710463f4aebebef3fb7b1e836aaf6fb826d39437f43a7824db5f2c07b816602a
 SHA512:
-  metadata.gz: 3e911bd401cf6459e7e24ed6396b2e4b0c0c6bad1e31e66e7204edbb568dcc2963f155f509c6638959f4f91dc2bbce5c4d7f2cd434e74609278f265a601e317c
-  data.tar.gz: f4755d5079887a84bf97acb6624a1917648c98ea35e00e05f0128a32f15556c7d0d25e9eb793c70d9dae7e11f1e25da2c65d5e84aa738137b12726158a6d0c00
+  metadata.gz: 8141b228d3b18572ad49d642862705ec7d73807a12729a351879624d3e304010a2d2830b530aa19290ed2ab051297beebad8130a55f7a9816c9388a71de515d6
+  data.tar.gz: f85bdc035ecee2c8e8f07168722a263dd862823d5c39ddb53845dcc802108febe2e15485981c3fc2e1fa9b4a4c34674de24019c8273e52847cf66fdcdf73700b

data/bin/colorly

@@ -7,18 +7,15 @@ router = Colorly::CLI.router
 
 begin
   exit router.run ARGV
-
 rescue Interrupt
   say "\nGoodbye"
-  exit 1  
-
+  exit 1
 rescue => e
   if ENV['DEBUG']
-    puts e.backtrace.reverse 
-    say ""
+    puts e.backtrace.reverse
+    say ''
   end
   say "!undred!ERROR: #{e.class}"
   say e.message
   exit 1
-
-end
+end

data/lib/colorly/cli.rb

@@ -2,7 +2,7 @@ module Colorly
   class CLI
     def self.router
       router = MisterBin::Runner.new version: VERSION,
-        header: "Colorly Color Palette Tools"
+        header: 'Colorly Color Palette Tools'
 
       router.route_all to: Command
       router

data/lib/colorly/command.rb

@@ -1,5 +1,5 @@
-require "colsole"
-require "mister_bin"
+require 'colsole'
+require 'mister_bin'
 require 'erb'
 require 'filewatcher'
 require 'json'
@@ -9,24 +9,24 @@ require 'yaml'
 module Colorly
   class Command < MisterBin::Command
     include Colsole
-    summary "Run a colorly script"
+    summary 'Run a colorly script'
     version Colorly::VERSION
 
-    help "Execute a colorly script and save or print its output"
+    help 'Execute a colorly script and save or print its output'
 
-    usage "colorly SCRIPT [OUTPUT_PATH] [--watch --names]"
-    usage "colorly --help | --version"
+    usage 'colorly SCRIPT [OUTPUT_PATH] [--watch --names]'
+    usage 'colorly --help | --version'
 
-    option "-w --watch", "Watch the script file and regenerate on change"
-    option "-n --names", "Also show color names and shades (slower)"
+    option '-w --watch', 'Watch the script file and regenerate on change'
+    option '-n --names', 'Also show color names and shades (slower)'
 
-    param "SCRIPT", "Path to script file"
-    param "OUTPUT_PATH", "Path to output file. The output format is determined by the file extension. Supported formats:\n- YAML (.yaml or .yml)\n- JSON (.json)\n- HTML (.html)\nIf left empty, YAML format will be sent to STDOUT."
+    param 'SCRIPT', 'Path to script file'
+    param 'OUTPUT_PATH', "Path to output file. The output format is determined by the file extension. Supported formats:\n- YAML (.yaml or .yml)\n- JSON (.json)\n- HTML (.html)\nIf left empty, YAML format will be sent to STDOUT."
 
-    example "colorly examples/example.rb"
-    example "colorly examples/example.rb --names"
-    example "colorly examples/example.rb out.json"
-    example "colorly examples/example.rb out.html --watch --names"
+    example 'colorly examples/example.rb'
+    example 'colorly examples/example.rb --names'
+    example 'colorly examples/example.rb out.json'
+    example 'colorly examples/example.rb out.html --watch --names'
 
     attr_reader :script_path, :script, :out_path, :use_names
 
@@ -35,21 +35,21 @@ module Colorly
       @out_path = args['OUTPUT_PATH']
       @use_names = args['--names']
 
-      if args['--watch']
-        generate
-        watch_and_generate
-      else
-        generate
-      end
+      generate
+      return unless args['--watch']
+
+      watch_and_generate
     end
 
   private
 
+    def filewatcher
+      @filewatcher ||= Filewatcher.new(script_path)
+    end
+
     def watch_and_generate
       say "Watching !txtpur!#{script_path}"
-      Filewatcher.new(script_path).watch do
-        generate
-      end
+      filewatcher.watch { generate }
     end
 
     def generate
@@ -78,7 +78,7 @@ module Colorly
       else
         raise Colorly::ArgumentError, "Unknown output format for #{out_path}"
       end
-      
+
       File.write out_path, out_string
       say "Saved !txtpur!#{out_path}"
     end
@@ -88,14 +88,11 @@ module Colorly
     end
 
     def html_template_file
-      File.expand_path "templates/html.erb", __dir__
+      File.expand_path 'templates/html.erb', __dir__
     end
 
     def erb(template, vars)
-      # TODO: This new format is only supported in Ruby >= 2.6
-      #       So for now, we keep the old deprecated syntax
-      # ERB.new(template, trim_mode: '%-').result(binding)
-      ERB.new(template, nil, '%-').result(OpenStruct.new(vars).instance_eval { binding })
+      ERB.new(template, trim_mode: '%-').result(OpenStruct.new(vars).instance_eval { binding })
     end
   end
 end

data/lib/colorly/dsl.rb

@@ -4,7 +4,7 @@ module Colorly
       @current_title = title
     end
 
-    def add(color)      
+    def add(color)
       if color.is_a? Array
         color.each { |c| add c }
       else
@@ -19,7 +19,7 @@ module Colorly
     end
 
     def random
-      "#%06x" % (rand * 0xffffff)
+      '#%06x' % (rand * 0xffffff)
     end
   end
 end

data/lib/colorly/exceptions.rb

@@ -21,5 +21,3 @@ module Colorly
     end
   end
 end
-
-

data/lib/colorly/extensions/chroma_color.rb

@@ -23,42 +23,42 @@ protected
       this_hex = "##{this_hex}"
       if to_hex == this_hex
         return {
-          name: this_name, 
+          name:  this_name,
           shade: this_shade,
         }
       end
 
       candidate_distance = color_distance this_hex.paint
 
-      if !distance or distance > candidate_distance
-        distance = candidate_distance
-        result = {
-          name: this_name, 
-          shade: this_shade,
-        }
-      end
+      next unless !distance || (distance > candidate_distance)
+
+      distance = candidate_distance
+      result = {
+        name:  this_name,
+        shade: this_shade,
+      }
     end
 
     result
   end
 
   def color_distance(other)
-    rgb_distance(other) + hsl_distance(other) * 2
+    rgb_distance(other) + (hsl_distance(other) * 2)
   end
 
   def rgb_distance(other)
     r1, g1, b1 = rgb
     r2, g2, b2 = other.rgb
 
-    (r1 - r2) ** 2 + (g1 - g2) ** 2 + (b1 - b2) ** 2
+    ((r1 - r2)**2) + ((g1 - g2)**2) + ((b1 - b2)**2)
   end
 
   def hsl_distance(other)
     h1, s1, l1 = hsl
     h2, s2, l2 = other.hsl
 
-    (((h1 - h2) ** 2).abs / 360.0) + 
-      ((s1 - s2) ** 2).abs + 
-      ((l1 - l2) ** 2).abs
+    (((h1 - h2)**2).abs / 360.0) +
+      ((s1 - s2)**2).abs +
+      ((l1 - l2)**2).abs
   end
 end

data/lib/colorly/refinements/string.rb

@@ -3,36 +3,36 @@ require 'chroma'
 module StringRefinements
   refine String do
     def spin(*args)
-      paint.spin *args
+      paint.spin(*args)
     end
 
     def brighten(*args)
-      paint.brighten *args
+      paint.brighten(*args)
     end
 
     def lighten(*args)
-      paint.lighten *args
+      paint.lighten(*args)
     end
 
     def darken(*args)
-      paint.darken *args
+      paint.darken(*args)
     end
 
     def saturate(*args)
-      paint.saturate *args
+      paint.saturate(*args)
     end
 
     def desaturate(*args)
-      paint.desaturate *args
+      paint.desaturate(*args)
     end
 
     def greyscale
       paint.greyscale
     end
-    alias grayscale greyscale
+    alias_method :grayscale, :greyscale
 
     def palette(*args)
-      paint.palette *args
+      paint.palette(*args)
     end
   end
-end
+end

data/lib/colorly/script.rb

@@ -7,19 +7,21 @@ module Colorly
 
     def self.load(script_file)
       raise ScriptNotFound, "Unable to load #{script_file}" unless File.exist? script_file
+
       new File.read(script_file), filename: script_file
     end
 
     def initialize(script, filename: nil)
-      @script, @filename = script, filename
+      @script = script
+      @filename = filename
     end
 
     def run
       run!
     rescue SyntaxError => e
-      raise ScriptSyntaxError.new e
+      raise ScriptSyntaxError, e
     rescue => e
-      raise ScriptError.new e
+      raise ScriptError, e
     end
 
     def output
@@ -58,8 +60,7 @@ module Colorly
     end
 
     def current_title
-      @current_title ||= "Colors"
+      @current_title ||= 'Colors'
     end
-
   end
 end

data/lib/colorly/version.rb

@@ -1,3 +1,3 @@
 module Colorly
-  VERSION = "0.1.1"
+  VERSION = '0.1.3'
 end

data/lib/colorly.rb

@@ -1,15 +1,15 @@
-require "yaml"
-require "requires"
-require "byebug" if ENV["BYEBUG"]
-requires \
-  "colorly/exceptions",
-  "colorly/version",
-  "colorly"
+require 'yaml'
+require 'requires'
+require 'byebug' if ENV['BYEBUG']
+
+requires 'colorly/exceptions'
+requires 'colorly/version'
+requires 'colorly'
 
 module Colorly
   class << self
     def color_names
-      @color_names ||= YAML.load_file(File.expand_path "colorly/data/color-names.yml", __dir__)['colors']
+      @color_names ||= YAML.load_file(File.expand_path 'colorly/data/color-names.yml', __dir__)['colors']
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colorly
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-10 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chroma
@@ -30,56 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: filewatcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mister_bin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: requires
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 description: Command line for generating color palettes
 email: db@dannyben.com
 executables:
@@ -106,6 +106,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/DannyBen/colorly/issues
   source_code_uri: https://github.com/dannyben/colorly
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -114,14 +115,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.25
+rubygems_version: 3.4.3
 signing_key: 
 specification_version: 4
 summary: Colorly color palette CLI