stylegen 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31f78139e4e4008bf37ab9d48bc8e00309b7a04d98be8e0a2d66a281afde0780
-  data.tar.gz: e08e613e70ef4ca0f96989051db35496783caf8c4de3245fb78600d6a72cd15a
+  metadata.gz: 1111eac2ab1e78ddbbf145cd5e312055987fb2c5cb9d8583bfb285bed59ed0fd
+  data.tar.gz: 1d52bbd99656c48c30283e92f027c762c4a2bb7a9dea97f6b9011cf1697d0c90
 SHA512:
-  metadata.gz: aa6e4794fb3fa16e907aa5fe272fce946b225de69565ca92dee659dd2ddaae63e6ae141c320366bb05ff8dade91ae5b3acd1cb8ca5f0641ab44cfa909971a4bc
-  data.tar.gz: d0b5c306bb2edc0e1c017ba35df7dfb6445d02fe66b12cc7560999461c7ce4a2549378a47b371466b49771cb7300fb360a50ca6345f62e48c23137d1a58644d2
+  metadata.gz: 1644652ac415fd8c664d212fb6e5124f343534db30ab826e90393ba021b8ee1b6adf41553a05e0f1a85fc26fc577fa32ff3378e7d8fe4daa5027bf3f53f9d490
+  data.tar.gz: bd3b5852200b345aa27c654c37f7d2ff93d22bede05b36ca2952769f51466fb759efaa00acecf26ca8fbe83cc9c6665828b38440a29b2376527bd0e82137d496

data/CHANGELOG.md

@@ -1,6 +1,17 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## v0.6.1
+### Fixed
+- Fixed a bug where an extra space was being added after the access-level modifier in the generated code.
+
+## v0.6.0
+### Changed
+- Switched from GLI to dry-cli for CLI. Some may produce slightly different STDOUT and STDERR output.
+### Added
+- Added `--output` flag to `stylegen init` command. This allows you to specify a different output file than the default `theme.yaml`.
+- Added `--input` flag to `stylegen build` command. This allows you to specify a different input file than the default `theme.yaml`.
+
 ## v0.5.0
 ### Changed
 - Switched generated code from `struct` to `class`.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2021 Ramon Torres
+Copyright (c) 2021-2023 Ramon Torres
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/stylegen

@@ -1,6 +1,13 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'stylegen/cli'
+require 'stylegen'
 
-exit Stylegen::CLI::App.run(ARGV)
+begin
+  arguments = ARGV.empty? ? ['build'] : ARGV
+  cli = Dry::CLI.new(Stylegen::CLI::Commands)
+  cli.call(arguments: arguments)
+rescue Stylegen::CLI::Commands::Error => e
+  warn e.message
+  exit 1
+end

data/lib/stylegen/cli/commands.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'yaml'
+require 'dry/cli'
+
+require 'stylegen/validator'
+require 'stylegen/generator'
+require 'stylegen/version'
+require 'stylegen/cli/error'
+
+module Stylegen
+  module CLI
+    module Commands
+      extend Dry::CLI::Registry
+
+      class Error < StandardError
+      end
+
+      class Version < Dry::CLI::Command
+        desc 'Prints stylegen version'
+
+        def call(*)
+          puts "stylegen version #{Stylegen::VERSION}"
+        end
+      end
+
+      class Init < Dry::CLI::Command
+        desc 'Generates a sample theme.yaml file in the current directory'
+
+        option :output, aliases: ['-o'], type: :string, default: 'theme.yaml', desc: 'Path to the output file'
+
+        def call(output: 'theme.yaml', **)
+          raise Error, "'#{output}' already exists." if File.exist?(output)
+
+          template = File.read(File.join(__dir__, 'template.yaml'))
+          File.write(output, template)
+
+          puts "Generated '#{output}'."
+        end
+      end
+
+      class Build < Dry::CLI::Command
+        desc 'Generates the Swift colors file'
+
+        option :input, aliases: ['-i'], type: :string, default: 'theme.yaml', desc: 'Path to the theme.yaml file'
+
+        def call(input: 'theme.yaml', **)
+          raise Error, "'#{input}' not found. Create one with 'stylegen init'." unless File.exist?(input)
+
+          data = File.open(input) { |file| YAML.safe_load(file) }
+
+          validator = Validator.new
+          unless validator.valid?(data)
+            message = []
+            message << "#{input} contains one or more errors:"
+
+            validator.validate(data).each do |e|
+              message << "  #{e}"
+            end
+
+            raise Error, message.join("\n")
+          end
+
+          generator = Generator.new(data)
+          generator.generate
+
+          puts "Generated '#{generator.stats[:output_path]}' with #{generator.stats[:color_count]} colors."
+        end
+      end
+
+      register 'init', Init
+      register 'build', Build
+      register 'version', Version, aliases: ['-v', '--version']
+    end
+  end
+end

data/lib/stylegen/cli/error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Stylegen
+  module CLI
+    class Error < StandardError
+    end
+  end
+end

data/lib/stylegen/cli.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'stylegen/cli/app'
+require 'stylegen/cli/commands'

data/lib/stylegen/colors/color.rb

@@ -4,6 +4,8 @@ module Stylegen
   class Color
     attr_reader :red, :green, :blue, :alpha
 
+    SIX_DIGIT_HEX_REGEX = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/.freeze
+    THREE_DIGIT_HEX_REGEX = /^#?([a-f\d])([a-f\d])([a-f\d])$/.freeze
     MAX_PRECISION = 16
 
     def initialize(red, green, blue, alpha)
@@ -14,11 +16,11 @@ module Stylegen
     end
 
     def self.from_hex(hex, alpha = nil)
-      if (match = hex.downcase.match(/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/))
+      if (match = hex.downcase.match(SIX_DIGIT_HEX_REGEX))
         r = Integer(match.captures[0], 16) / 255.0
         g = Integer(match.captures[1], 16) / 255.0
         b = Integer(match.captures[2], 16) / 255.0
-      elsif (match = hex.downcase.match(/^#?([a-f\d])([a-f\d])([a-f\d])$/))
+      elsif (match = hex.downcase.match(THREE_DIGIT_HEX_REGEX))
         r = Integer(match.captures[0] * 2, 16) / 255.0
         g = Integer(match.captures[1] * 2, 16) / 255.0
         b = Integer(match.captures[2] * 2, 16) / 255.0

data/lib/stylegen/data.rb

@@ -62,7 +62,7 @@ module Stylegen
     end
 
     def effective_access_level
-      access_level == 'internal' ? '' : "#{access_level} "
+      access_level == 'internal' ? '' : access_level
     end
 
     def struct_name

data/lib/stylegen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Stylegen
-  VERSION = '0.5.0'
+  VERSION = '0.6.1'
 end

data/lib/stylegen.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'stylegen/version'
+require 'stylegen/cli'
 require 'stylegen/colors'
 require 'stylegen/generator'
 require 'stylegen/data'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: stylegen
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ramon Torres
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-15 00:00:00.000000000 Z
+date: 2023-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-inflector
+  name: dry-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: json_schemer
   requirement: !ruby/object:Gem::Requirement
@@ -144,20 +144,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".deepsource.toml"
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".rubocop.yml"
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
-- Rakefile
 - bin/stylegen
 - lib/stylegen.rb
 - lib/stylegen/cli.rb
-- lib/stylegen/cli/app.rb
+- lib/stylegen/cli/commands.rb
+- lib/stylegen/cli/error.rb
 - lib/stylegen/cli/template.yaml
 - lib/stylegen/colors.rb
 - lib/stylegen/colors/base_elevated_color.rb
@@ -169,15 +163,11 @@ files:
 - lib/stylegen/template.rb
 - lib/stylegen/validator.rb
 - lib/stylegen/version.rb
-- stylegen.gemspec
-- test/helper.rb
-- test/test_base_elevated_color.rb
-- test/test_color.rb
-- test/test_light_dark_color.rb
 homepage: https://github.com/raymondjavaxx/stylegen
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -193,12 +183,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Tool for generating styling code for iOS apps
-test_files:
-- test/helper.rb
-- test/test_base_elevated_color.rb
-- test/test_color.rb
-- test/test_light_dark_color.rb
+test_files: []

data/.deepsource.toml

@@ -1,5 +0,0 @@
-version = 1
-
-[[analyzers]]
-name = "ruby"
-enabled = true

data/.github/workflows/ci.yml

@@ -1,32 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version:
-          - "2.5"
-          - "2.6"
-          - "2.7"
-          - "3.0"
-          - "3.1"
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Lint
-      run: bundle exec rake rubocop
-    - name: Run tests
-      run: bundle exec rake

data/.gitignore

@@ -1,6 +0,0 @@
-.idea
-pkg
-
-# Testing artifacts
-theme.yaml
-Colors.swift

data/.rubocop.yml

@@ -1,16 +0,0 @@
-require:
-  - rubocop-rake
-  - rubocop-minitest
-
-AllCops:
-  TargetRubyVersion: 2.5
-  NewCops: enable
-
-Metrics/MethodLength:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false

data/Gemfile

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec

data/Gemfile.lock

@@ -1,63 +0,0 @@
-PATH
-  remote: .
-  specs:
-    stylegen (0.5.0)
-      dry-inflector (~> 0.2.0)
-      gli (~> 2.1)
-      json_schemer (~> 0.2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    dry-inflector (0.2.0)
-    ecma-re-validator (0.3.0)
-      regexp_parser (~> 2.0)
-    gli (2.21.0)
-    hana (1.3.7)
-    json_schemer (0.2.24)
-      ecma-re-validator (~> 0.3)
-      hana (~> 1.3)
-      regexp_parser (~> 2.0)
-      uri_template (~> 0.7)
-    minitest (5.14.4)
-    parallel (1.20.1)
-    parser (3.0.1.1)
-      ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rubocop (1.14.0)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
-      parser (>= 3.0.1.1)
-    rubocop-minitest (0.12.1)
-      rubocop (>= 0.90, < 2.0)
-    rubocop-rake (0.5.1)
-      rubocop
-    ruby-progressbar (1.11.0)
-    unicode-display_width (2.0.0)
-    uri_template (0.7.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  minitest (~> 5.14)
-  rake
-  rubocop
-  rubocop-minitest
-  rubocop-rake
-  stylegen!
-
-BUNDLED WITH
-   2.1.4

data/Rakefile

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require 'rubocop/rake_task'
-
-Rake::TestTask.new
-RuboCop::RakeTask.new
-
-task default: :test

data/lib/stylegen/cli/app.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'yaml'
-require 'gli'
-
-require 'stylegen/validator'
-require 'stylegen/generator'
-
-module Stylegen
-  module CLI
-    class App
-      extend GLI::App
-
-      program_desc 'CLI tool for managing colors in iOS apps'
-
-      version Stylegen::VERSION
-
-      default_command :build
-
-      # Commands
-
-      desc 'Generates a sample theme.yaml file in the current directory'
-      command :init do |c|
-        c.action do
-          exit_now!("'theme.yaml' already exists!") if File.exist?('theme.yaml')
-
-          template = File.read(File.join(__dir__, 'template.yaml'))
-          File.write('theme.yaml', template)
-
-          puts "Generated 'theme.yaml'."
-        end
-      end
-
-      desc 'Generates the Swift colors file'
-      command :build do |c|
-        c.action do
-          exit_now!("'theme.yaml' not found. Create one with 'stylegen init'.") unless File.exist?('theme.yaml')
-
-          data = File.open('theme.yaml') { |file| YAML.safe_load(file) }
-
-          validator = Validator.new
-
-          unless validator.valid?(data)
-            message = []
-            message << 'theme.yaml contains one or more errors:'
-
-            validator.validate(data).each do |e|
-              message << "  #{e}"
-            end
-
-            exit_now!(message.join("\n"))
-          end
-
-          generator = Generator.new(data)
-          generator.generate
-
-          puts "Generated '#{generator.stats[:output_path]}' with #{generator.stats[:color_count]} colors."
-        end
-      end
-    end
-  end
-end

data/stylegen.gemspec

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require './lib/stylegen/version'
-
-Gem::Specification.new do |s|
-  s.name = 'stylegen'
-  s.version = Stylegen::VERSION
-  s.platform = Gem::Platform::RUBY
-  s.authors = ['Ramon Torres']
-  s.email = ['raymondjavaxx@gmail.com']
-  s.homepage = 'https://github.com/raymondjavaxx/stylegen'
-  s.description = s.summary = 'Tool for generating styling code for iOS apps'
-  s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  s.require_paths = ['lib']
-  s.license = 'MIT'
-
-  s.add_runtime_dependency 'dry-inflector', '~> 0.2.0'
-  s.add_runtime_dependency 'gli', '~> 2.1'
-  s.add_runtime_dependency 'json_schemer', '~> 0.2.0'
-
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'minitest', '~> 5.14'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'rubocop'
-  s.add_development_dependency 'rubocop-minitest'
-  s.add_development_dependency 'rubocop-rake'
-
-  s.required_ruby_version = '>= 2.5.0'
-end

data/test/helper.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-gem 'minitest'
-
-require 'minitest/pride'
-require 'minitest/autorun'
-
-require_relative '../lib/stylegen'

data/test/test_base_elevated_color.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class TestBaseElevatedColor < MiniTest::Test
-  def test_to_string
-    color = Stylegen::BaseElevatedColor.new(
-      Stylegen::Color.from_hex('#000000'),
-      Stylegen::Color.from_hex('#333333')
-    )
-
-    # Default indentation
-
-    expected = <<~CODE.chomp
-      ThemeColor(
-          base: ThemeColor(white: 0.0, alpha: 1.0),
-          elevated: ThemeColor(white: 0.2, alpha: 1.0)
-      )
-    CODE
-
-    assert_equal expected, color.to_s('ThemeColor')
-
-    # Additional indentation
-
-    expected = <<~CODE.chomp
-      ThemeColor(
-              base: ThemeColor(white: 0.0, alpha: 1.0),
-              elevated: ThemeColor(white: 0.2, alpha: 1.0)
-          )
-    CODE
-
-    assert_equal expected, color.to_s('ThemeColor', 4)
-  end
-end

data/test/test_color.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class TestColor < MiniTest::Test
-  def test_parsing
-    color = Stylegen::Color.from_hex('#FF8000')
-    assert_in_delta(1.0, color.red)
-    assert_in_delta(0.5019607843137255, color.green)
-    assert_in_delta(0.0, color.blue)
-    assert_in_delta(1.0, color.alpha)
-
-    # Optional pound sign
-    color = Stylegen::Color.from_hex('FF8000')
-    assert_in_delta(1.0, color.red)
-    assert_in_delta(0.5019607843137255, color.green)
-    assert_in_delta(0.0, color.blue)
-    assert_in_delta(1.0, color.alpha)
-
-    # Specify alpha
-    color = Stylegen::Color.from_hex('#FF8000', 0.5)
-    assert_in_delta(0.5, color.alpha)
-  end
-
-  def test_parsing_shorthand_syntax
-    color = Stylegen::Color.from_hex('#FC0')
-    assert_in_delta(1.0, color.red)
-    assert_in_delta(0.8000000000000002, color.green)
-    assert_in_delta(0.0, color.blue)
-    assert_in_delta(1.0, color.alpha)
-
-    # Optional pound sign
-    color = Stylegen::Color.from_hex('FC0')
-    assert_in_delta(1.0, color.red)
-    assert_in_delta(0.8000000000000002, color.green)
-    assert_in_delta(0.0, color.blue)
-    assert_in_delta(1.0, color.alpha)
-  end
-
-  def test_grayscale
-    color = Stylegen::Color.new(1, 1, 1, 1)
-    assert color.grayscale?
-
-    color = Stylegen::Color.new(1, 1, 0.9, 1)
-    refute color.grayscale?
-  end
-
-  def test_to_string
-    color = Stylegen::Color.from_hex('#00FF00')
-
-    expected = <<~CODE.strip
-      ThemeColor(
-          red: 0.0,
-          green: 1.0,
-          blue: 0.0,
-          alpha: 1.0
-      )
-    CODE
-
-    assert_equal expected, color.to_s('ThemeColor')
-
-    # Grayscale
-    color = Stylegen::Color.from_hex('#FFFFFF')
-    expected = 'ThemeColor(white: 1.0, alpha: 1.0)'
-    assert_equal expected, color.to_s('ThemeColor')
-  end
-end

data/test/test_light_dark_color.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'helper'
-
-class TestLightDarkColor < MiniTest::Test
-  def test_to_string
-    color = Stylegen::LightDarkColor.new(
-      Stylegen::Color.from_hex('#FFFFFF'),
-      Stylegen::Color.from_hex('#333333')
-    )
-
-    # Default indentation
-
-    expected = <<~CODE.chomp
-      ThemeColor(
-          light: ThemeColor(white: 1.0, alpha: 1.0),
-          dark: ThemeColor(white: 0.2, alpha: 1.0)
-      )
-    CODE
-
-    assert_equal expected, color.to_s('ThemeColor')
-
-    # Additional indentation
-
-    expected = <<~CODE.chomp
-      ThemeColor(
-              light: ThemeColor(white: 1.0, alpha: 1.0),
-              dark: ThemeColor(white: 0.2, alpha: 1.0)
-          )
-    CODE
-
-    assert_equal expected, color.to_s('ThemeColor', 4)
-  end
-end