stylegen 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6880c6848932f2c2f954860a1885cfd20fda16e99f6ea01dd8c5fe5731658c45
-  data.tar.gz: b7f49e94a5c19dbe464b3c246cf1834b7477b118c006aea1eed9ebd0c548acd6
+  metadata.gz: 5c648fda564306d4dc88dab32098c2d6fb0a355e16adb0c352eec6b5ca7cea23
+  data.tar.gz: 0517ac0a864f9663f508376d3ab71859a248f82c028fbb14bd2eb33ac8ce6658
 SHA512:
-  metadata.gz: d16722e424e033cd0d29b73ffa65358de4bdc490a3bf44736202f403bba405b6d4cb64499646dead5cc6185c71e0708d0977ac9688c4fd3baffd88f69ec6e546
-  data.tar.gz: 264639f5ff9bf1541f3670cf428c7390ec72d3746144501fa039eae7ce5a4b28f7bd3dfb72cc02ade6ce3ee9db6bdd844646ad1e11657dba9068afd9e70b0c5a
+  metadata.gz: 81a4d52f8b5c45938296c7b934069ff6b0906e167d554798da00e893fe38838623ca206d576222dbededddefa6885e2a25e04e29fe56fe93ff2892bda62e0cce
+  data.tar.gz: ce866c1b9c3de44234b290d964baa02c819ac814e74541e59f54fa112c0913752ba83281303ab82c5f182ce6f8301a8bf209c1861737ab3e967ad4fe7d2e7cb8

data/.github/workflows/ci.yml

@@ -21,10 +21,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/.rubocop.yml

@@ -3,7 +3,7 @@ require:
   - rubocop-minitest
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   NewCops: enable
 
 Style/StringLiterals:

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+## v0.3.0
+### Added
+- SwiftUI support.
+
+## v0.2.0
+### Added
+- `stylegen init` command.
+
+## v0.1.0
+- Initial release.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stylegen (0.2.0)
+    stylegen (0.3.0)
       dry-inflector (~> 0.2.0)
       gli (~> 2.1)
       json_schemer (~> 0.2.0)
@@ -9,38 +9,38 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
+    ast (2.4.2)
     dry-inflector (0.2.0)
     ecma-re-validator (0.3.0)
       regexp_parser (~> 2.0)
     gli (2.20.0)
     hana (1.3.7)
-    json_schemer (0.2.17)
+    json_schemer (0.2.18)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       uri_template (~> 0.7)
-    minitest (5.14.3)
+    minitest (5.14.4)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (13.0.3)
-    regexp_parser (2.0.3)
-    rexml (3.2.4)
-    rubocop (1.8.1)
+    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.2.0, < 2.0)
+      rubocop-ast (>= 1.5.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.0)
-      parser (>= 2.7.1.5)
-    rubocop-minitest (0.10.3)
-      rubocop (>= 0.87, < 2.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)

data/README.md

@@ -38,6 +38,9 @@ The generated YAML file will look similar to this:
 # Path of generated Swift file.
 output_path: "Colors.swift"
 
+# Enables SwiftUI support
+# swiftui: false
+
 # Key-value pairs of theme colors.
 colors:
 
@@ -101,5 +104,5 @@ colors. The name of the namespacing function gets inferred from the `system_name
 
 * ~~`$ stylegen init` command~~
 * Option to specify target frameworks: AppKit, UIKit, Core Graphics, and SwiftUI
-* SwiftUI support
+* ~~SwiftUI support~~
 * AppKit support

data/lib/stylegen/cli/template.yaml

@@ -7,6 +7,9 @@
 # Path of generated Swift file.
 output_path: "Colors.swift"
 
+# Enables SwiftUI support
+# swiftui: false
+
 # Key-value pairs of theme colors.
 colors:
 

data/lib/stylegen/data.rb

@@ -30,6 +30,10 @@ module Stylegen
       @data["output_path"]
     end
 
+    def swiftui?
+      @data["swiftui"] || false
+    end
+
     def basename
       File.basename(@data["output_path"])
     end

data/lib/stylegen/generator.rb

@@ -1,126 +1,25 @@
 # frozen_string_literal: true
 
 require "stylegen/data"
+require "stylegen/template"
 
 module Stylegen
   class Generator
     def initialize(data)
       @data = Data.new(data)
-      @file = File.open(@data.output_path, "w")
-    end
-
-    def out(line)
-      @file << line << "\n"
     end
 
     def generate
-      generate_header
-      generate_struct
-      generate_colors
-      generate_extensions
+      template_content = File.read(File.join(__dir__, "resources/template.swift.erb"))
+      template = Template.new(template_content, @data)
+
+      file = File.open(@data.output_path, "w")
+      file << template.render
+      file.close
     end
 
     def stats
       @stats ||= { output_path: @data.output_path, color_count: @data.colors.count }
     end
-
-    private
-
-    def generate_header
-      out "//"
-      out "//  #{@data.basename}"
-      out "//"
-      out "//  Autogenerated by stylegen (v#{@data.version})"
-      out "//  DO NOT EDIT"
-      out "//"
-      out ""
-      out "import UIKit"
-      out ""
-    end
-
-    def generate_struct
-      out "#{@data.access_level} struct #{@data.struct_name} {"
-      out ""
-      out "    let uiColor: UIColor"
-      out ""
-      out "    fileprivate init(white: CGFloat, alpha: CGFloat) {"
-      out "        self.uiColor = UIColor(white: white, alpha: alpha)"
-      out "    }"
-      out ""
-      out "    fileprivate init(red: CGFloat, green: CGFloat, blue: CGFloat, alpha: CGFloat) {"
-      out "        self.uiColor = UIColor(red: red, green: green, blue: blue, alpha: alpha)"
-      out "    }"
-      out ""
-      out "    fileprivate init(_ color: UIColor) {"
-      out "        self.uiColor = color"
-      out "    }"
-      out ""
-      out "    fileprivate init(light: #{@data.struct_name}, dark: #{@data.struct_name}) {"
-      out "        if #available(iOS 13.0, *) {"
-      out "            self.uiColor = UIColor(dynamicProvider: { (traits: UITraitCollection) -> UIColor in"
-      out "                switch traits.userInterfaceStyle {"
-      out "                case .dark:"
-      out "                    return dark.uiColor"
-      out "                default:"
-      out "                    return light.uiColor"
-      out "                }"
-      out "            })"
-      out "        } else {"
-      out "            self.uiColor = light.uiColor"
-      out "        }"
-      out "    }"
-      out ""
-      out "    fileprivate init(base: #{@data.struct_name}, elevated: #{@data.struct_name}) {"
-      out "        if #available(iOS 13.0, *) {"
-      out "            self.uiColor = UIColor(dynamicProvider: { (traits: UITraitCollection) -> UIColor in"
-      out "                switch traits.userInterfaceLevel {"
-      out "                case .elevated:"
-      out "                    return elevated.uiColor"
-      out "                default:"
-      out "                    return base.uiColor"
-      out "                }"
-      out "            })"
-      out "        } else {"
-      out "            self.uiColor = base.uiColor"
-      out "        }"
-      out "    }"
-      out ""
-      out "}"
-      out ""
-    end
-
-    def generate_colors
-      out "#{@data.access_level} extension #{@data.struct_name} {"
-      out ""
-
-      @data.colors.each do |member, color|
-        out "    static let #{member} = #{color.to_s(@data.struct_name, 4)}"
-        out ""
-      end
-
-      out "}"
-      out ""
-    end
-
-    def generate_extensions
-      out "#{@data.access_level} extension UIColor {"
-      out ""
-      out "    @inline(__always)"
-      out "    static func #{@data.util_method_name}(_ color: #{@data.struct_name}) -> UIColor {"
-      out "       return color.uiColor"
-      out "    }"
-      out ""
-      out "}"
-      out ""
-
-      out "#{@data.access_level} extension CGColor {"
-      out ""
-      out "    @inline(__always)"
-      out "    static func #{@data.util_method_name}(_ color: #{@data.struct_name}) -> CGColor {"
-      out "       return color.uiColor.cgColor"
-      out "    }"
-      out ""
-      out "}"
-    end
   end
 end

data/lib/stylegen/{schema.json → resources/schema.json}

@@ -83,6 +83,11 @@
       "minLength": 1,
       "description": "Path of generated Swift file."
     },
+    "swiftui": {
+      "type": "boolean",
+      "default": false,
+      "description": "Enables SwiftUI support."
+    },
     "colors": {
       "type": "object",
       "description": "Key-value pairs of colors.",

data/lib/stylegen/resources/template.swift.erb

@@ -0,0 +1,97 @@
+//
+//  <%= @data.basename %>
+//
+//  Autogenerated by stylegen (<%= @data.version %>)
+//  DO NOT EDIT
+//
+
+import UIKit
+<% if @data.swiftui? -%>
+import SwiftUI
+<% end -%>
+
+<%= @data.access_level %> struct <%= @data.struct_name %> {
+
+    let uiColor: UIColor
+
+    fileprivate init(white: CGFloat, alpha: CGFloat) {
+        self.uiColor = UIColor(white: white, alpha: alpha)
+    }
+
+    fileprivate init(red: CGFloat, green: CGFloat, blue: CGFloat, alpha: CGFloat) {
+        self.uiColor = UIColor(red: red, green: green, blue: blue, alpha: alpha)
+    }
+
+    fileprivate init(_ color: UIColor) {
+        self.uiColor = color
+    }
+
+    fileprivate init(light: <%= @data.struct_name %>, dark: <%= @data.struct_name %>) {
+        if #available(iOS 13.0, *) {
+            self.uiColor = UIColor(dynamicProvider: { (traits: UITraitCollection) -> UIColor in
+                switch traits.userInterfaceStyle {
+                case .dark:
+                    return dark.uiColor
+                default:
+                    return light.uiColor
+                }
+            })
+        } else {
+            self.uiColor = light.uiColor
+        }
+    }
+
+    fileprivate init(base: <%= @data.struct_name %>, elevated: <%= @data.struct_name %>) {
+        if #available(iOS 13.0, *) {
+            self.uiColor = UIColor(dynamicProvider: { (traits: UITraitCollection) -> UIColor in
+                switch traits.userInterfaceLevel {
+                case .elevated:
+                    return elevated.uiColor
+                default:
+                    return base.uiColor
+                }
+            })
+        } else {
+            self.uiColor = base.uiColor
+        }
+    }
+
+}
+
+// MARK: Colors
+
+<%= @data.access_level %> extension <%= @data.struct_name %> {
+<% @data.colors.each do |member, color| %>
+    static let <%= member %> = <%= color.to_s(@data.struct_name, 4) %>
+<% end %>
+}
+
+// MARK: - Extensions
+<% if @data.swiftui? %>
+<%= @data.access_level %> extension Color {
+
+    @inline(__always)
+    static func <%= @data.util_method_name %>(_ color: <%= @data.struct_name %>) -> Color {
+        return Color(color.uiColor)
+    }
+
+}
+<% end -%>
+
+<%= @data.access_level %> extension UIColor {
+
+    @inline(__always)
+    static func <%= @data.util_method_name %>(_ color: <%= @data.struct_name %>) -> UIColor {
+        return color.uiColor
+    }
+
+}
+
+<%= @data.access_level %> extension CGColor {
+
+    @inline(__always)
+    static func <%= @data.util_method_name %>(_ color: <%= @data.struct_name %>) -> CGColor {
+        return color.uiColor.cgColor
+    }
+
+}

data/lib/stylegen/template.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "erb"
+
+module Stylegen
+  class Template
+    def initialize(content, data)
+      @content = content
+      @data = data
+    end
+
+    def render
+      ERB.new(@content, nil, "-").result(binding)
+    end
+  end
+end

data/lib/stylegen/validator.rb

@@ -21,7 +21,7 @@ module Stylegen
     private
 
     def schema
-      @schema ||= JSONSchemer.schema(File.read(File.join(__dir__, "schema.json")))
+      @schema ||= JSONSchemer.schema(File.read(File.join(__dir__, "resources/schema.json")))
     end
   end
 end

data/lib/stylegen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Stylegen
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/stylegen.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rubocop-minitest"
   s.add_development_dependency "rubocop-rake"
 
-  s.required_ruby_version = ">= 2.4.0"
+  s.required_ruby_version = ">= 2.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stylegen
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ramon Torres
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -147,6 +147,7 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -163,7 +164,9 @@ files:
 - lib/stylegen/colors/light_dark_color.rb
 - lib/stylegen/data.rb
 - lib/stylegen/generator.rb
-- lib/stylegen/schema.json
+- lib/stylegen/resources/schema.json
+- lib/stylegen/resources/template.swift.erb
+- lib/stylegen/template.rb
 - lib/stylegen/validator.rb
 - lib/stylegen/version.rb
 - stylegen.gemspec
@@ -183,14 +186,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key:
 specification_version: 4
 summary: Tool for generating styling code for iOS apps