shufu 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17364e473508ee305a2ce5ca29833014f474deeec7123fb5aceeb4a39e0a8928
-  data.tar.gz: 07da5c874f8b7ead3e9bcb3389cda4bca000e400afde8733b7445eb5624680df
+  metadata.gz: 071d6191267e3bb684b700c188e3cdcc7924c7a93e329cf79c49eb0c203a0ff4
+  data.tar.gz: de82af9aac1ff9b9114f668f71b200706c1e6ba1e1d1e289d4ab562c830a9e6b
 SHA512:
-  metadata.gz: 0cadcc2fefaab6555da37f4e7be336e27ff79724a41cc648d97c9ec6a5d2fc5a33d791afafec7b97cc7e80dd34515e60eeb069c95515302ed5afcd07730e5338
-  data.tar.gz: f9035d6846f3a66e619bb6f49d5cbf2387b4ff1928ad61f6a35a00b021dfb326baf6511937ae62baa5fc8f78eaa5015ed885d9271cc84f4168d0182803e70fe3
+  metadata.gz: 32f4aed2b7910b2a3f0a405d248165c48cd94abeed5c2fdf01cfd711f51aa9d8aaa09628e8f9cc9b3049695f6343e6f11c814b8afafcc2681da361cf9b4cfa5e
+  data.tar.gz: dc924999be4ee8db979697cc0c1e12580703a6af0ac6933fbd225327d5c4f25a4584db4e176b3cfa8163b641d069c44ff388b0959b8d3ce30e389d98e6e3547b

data/Gemfile.lock

@@ -1,41 +1,14 @@
 PATH
   remote: .
   specs:
-    shufu (0.1.3)
+    shufu (0.1.4)
       dry-initializer
-      dry-schema
 
 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

@@ -23,14 +23,16 @@ Or install it yourself as:
 ```ruby
 require "shufu"
 
-arguments = [
+schema = [
+    { name: "git", type: "command" },
+    { name: "commit", type: "command" },
     { name: "amend", type: "flag" },
     { name: "author", type: "equal" }
 ]
 
-command = Shufu::Command.new("git commit", arguments)
+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"
 ```

data/lib/shufu/argument.rb

@@ -5,7 +5,7 @@ module Shufu
     extend Dry::Initializer
 
     option :name, proc(&:to_s)
-    option :type, proc(&:to_sym), default: proc { :param }
+    option :type, proc(&:to_sym), default: proc { :equal }
 
     def to_s(value)
       case type

data/lib/shufu/command.rb

@@ -1,14 +1,35 @@
 module Shufu
-  class InvalidSchemaError < RuntimeError; end
-
   class Command
-    def initialize(base, schema)
-      @base = base
+    #
+    # @param [Array<Hash>] schema
+    #
+    def initialize(schema)
       @schema = schema.map { |s| Argument.new(**s) }
     end
 
-    def line(values)
-      Line.new(@base, @schema, values).to_s
+    #
+    # @param [Hash] values
+    # @return [String]
+    #
+    def to_s(values)
+      arguments(values).join(" ")
+    end
+
+    #
+    # @reutrn [Array<String>]
+    #
+    def arguments(values)
+      [commands] + values.map { |k, v|
+        a = @schema.find { |a| a.name == k.to_s } || Argument.new(name: k)
+        a.to_s(v)
+      }
+    end
+
+    #
+    # @return [Array<String>]
+    #
+    def commands
+      @schema.select { |a| a.type == :command }.map(&:name)
     end
   end
 end

data/lib/shufu/version.rb

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

data/shufu.gemspec

@@ -24,6 +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.3
+  version: 0.1.4
 platform: ruby
 authors:
 - cc-kawakami
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: dry-schema
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +39,6 @@ files:
 - lib/shufu.rb
 - lib/shufu/argument.rb
 - lib/shufu/command.rb
-- lib/shufu/line.rb
 - lib/shufu/version.rb
 - shufu.gemspec
 homepage: https://github.com/cc-kawakami/shufu

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] + @values.map { |k, v|
-        argument = @schema.find { |a| a.name == k.to_s }
-        argument = Shufu::Argument.new(name: k) if !argument
-        argument.to_s(v)
-      }).join(" ")
-    end
-  end
-end