shufu 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb8875c20791059866fce8a4ffca83b5e6e072561200bd585b89a0124ebd7373
-  data.tar.gz: 583e2f2195d76d16144c2aa49d9914f2a6bd2557a7638114b67e2ef08ef1c267
+  metadata.gz: 5292874c3c0b7e7b686e584768b18a91498e6e7bf0c1b1d2dfcce2cc3708a852
+  data.tar.gz: 56e7e3d7addc3d78e4742610112a3640de0153fab82f78be248afc2f38b0e7c7
 SHA512:
-  metadata.gz: cd87095644fce9a66bd244ea53835313134528c3ac68a97a6516a8991abd26c5c2a4b26651cd3d4c5baa72ca78ceb7e1262a2c799e816c36e7f37bc81b2ae35f
-  data.tar.gz: 13fa0f03aaaf03a8b3313224eede86df53c6b05d1ccbf534d66d47e506d8d7fb10fe11c36ac2f746c4853a2707bc65162928b16afb26febc9f605dfffbd909ad
+  metadata.gz: b42b5b8ff788553bf653e5e5c4749be45ff57601bab548020caec226995cffee08a377ef1ddd68db5a47e159895f57ba7265783ad82961b3b94eea30356d1bad
+  data.tar.gz: 2a67a0eaa32072d833045a129d4a7026d1d4de6e967d42186f3d0422fd27396d1707d8721cd735c3cd1943388a6246100cef2a34aa1d117b47b05ece40046139

data/Gemfile.lock

@@ -1,40 +1,14 @@
 PATH
   remote: .
   specs:
-    shufu (0.1.1)
-      dry-schema
+    shufu (0.1.5)
+      dry-initializer
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.1.9)
     diff-lcs (1.5.0)
-    dry-configurable (0.14.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.6)
-    dry-container (0.9.0)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
-      concurrent-ruby (~> 1.0)
-    dry-inflector (0.2.1)
     dry-initializer (3.1.1)
-    dry-logic (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-schema (1.8.0)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-      dry-core (~> 0.5, >= 0.5)
-      dry-initializer (~> 3.0)
-      dry-logic (~> 1.0)
-      dry-types (~> 1.5)
-    dry-types (1.5.1)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
     power_assert (1.1.7)
     rake (13.0.6)
     rspec (3.10.0)

data/README.md

@@ -24,17 +24,19 @@ Or install it yourself as:
 require "shufu"
 
 schema = {
-    schema: [
-        { name: "amend", type: option, flag: true },
-        { name: "author", type: option, equal: true }
-    ]
+  git: {
+    commit: {
+      amend: :flag,
+      author: :equal
+    }
+  }
 }
 
-command = Shufu::Command.new("git commit", schema)
+command = Shufu::Command.new(schema)
 
-p command.line({ amend: true, author: "cc-kawakami" })
+p command.to_s({ amend: true, author: "cc-kawakami" })
 
-# git commit --amend --author=cc-kawakami
+# => "git commit --amend --author=cc-kawakami"
 ```
 
 ## Development

data/lib/shufu/argument.rb

@@ -0,0 +1,23 @@
+require "dry-initializer"
+
+module Shufu
+  class Argument
+    extend Dry::Initializer
+
+    option :name, proc(&:to_s)
+    option :type, proc(&:to_sym), default: proc { :equal }
+
+    def to_s(value)
+      case type
+      when :param
+        value
+      when :flag
+        value ? "--#{name}" : ""
+      when :equal
+        "--#{name}=#{value}"
+      when :space
+        "--#{name} #{value}"
+      end
+    end
+  end
+end

data/lib/shufu/command.rb

@@ -1,18 +1,34 @@
 module Shufu
-  class InvalidSchemaError < RuntimeError; end
-
   class Command
-    def initialize(base, schema)
-      @base = base
-      schema = Shufu::Schema.call(schema)
-      if schema.failure?
-        raise Shufu::InvalidSchemaError, schema.errors(full: true).to_h
-      end
+    #
+    # @param [Hash] schema
+    #
+    def initialize(schema)
       @schema = schema
     end
 
-    def line(values)
-      Line.new(@base, @schema, values).to_s
+    #
+    # @param [Hash] values
+    # @return [String]
+    #
+    def to_s(values)
+      arguments(@schema, values, []).join(" ")
+    end
+
+    #
+    # @param [Hash] schema
+    # @param [Hash] values
+    #
+    def arguments(schema, values, args)
+      schema.each do |k, v|
+        if v.is_a?(Hash)
+          args = arguments(v, values, args).prepend(k)
+        else
+          args << Argument.new(name: k, type: v).to_s(values[k]) if values[k]
+        end
+      end
+
+      args
     end
   end
 end

data/lib/shufu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shufu
-  VERSION = "0.1.1"
+  VERSION = "0.1.5"
 end

data/shufu.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "dry-schema"
+  spec.add_dependency "dry-initializer"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shufu
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.5
 platform: ruby
 authors:
 - cc-kawakami
@@ -11,7 +11,7 @@ cert_chain: []
 date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-schema
+  name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -37,10 +37,8 @@ files:
 - README.md
 - Rakefile
 - lib/shufu.rb
+- lib/shufu/argument.rb
 - lib/shufu/command.rb
-- lib/shufu/item.rb
-- lib/shufu/line.rb
-- lib/shufu/schema.rb
 - lib/shufu/version.rb
 - shufu.gemspec
 homepage: https://github.com/cc-kawakami/shufu

data/lib/shufu/item.rb

@@ -1,30 +0,0 @@
-module Shufu
-  class Item
-    def initialize(all_schema, name, value)
-      @all_schema = all_schema
-      @name = name
-      @value = value
-    end
-
-    def schema
-      @all_schema[:schema].find { |s| s[:name] == @name.to_s }
-    end
-    
-
-    def to_s
-      if schema[:type] == "argument"
-        @value
-      else
-        if schema[:flag]
-          "--#{@name}"
-        else
-          if schema[:equal]
-            "--#{@name}=#{@value}"
-          else
-            "--#{@name} #{@value}"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/shufu/line.rb

@@ -1,17 +0,0 @@
-module Shufu
-  class Line
-    def initialize(base, schema, values)
-      @base = base
-      @schema = schema
-      @values = values
-    end
-
-    def to_s
-      [@base, items].flatten.join(" ")
-    end
-
-    def items
-      @values.map { |k, v| Shufu::Item.new(@schema, k, v).to_s }
-    end
-  end
-end

data/lib/shufu/schema.rb

@@ -1,15 +0,0 @@
-require 'dry-schema'
-
-module Shufu
-  Schema = Dry::Schema.Params do
-    required(:schema).filled(:array).each do
-      hash do
-        required(:name).filled(:string)
-        required(:type).filled(:string)
-        optional(:position).maybe(:integer)
-        optional(:flag).maybe(:bool)
-        optional(:equal).maybe(:bool)
-      end
-    end
-  end
-end