shufu 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12426f786a5f221e6dc2eb0f8e42ec570605ea72da92c37db6afa2e5149f012b
-  data.tar.gz: 8c347d6d7235ea550b13764aea9938c6537cd6a4cbcf97225c5fb519d718d0b4
+  metadata.gz: 071d6191267e3bb684b700c188e3cdcc7924c7a93e329cf79c49eb0c203a0ff4
+  data.tar.gz: de82af9aac1ff9b9114f668f71b200706c1e6ba1e1d1e289d4ab562c830a9e6b
 SHA512:
-  metadata.gz: 338e7cd729aeeb3a4cffc29b88efcc31fca565f3f99dad03ff2235e45791c07c73ff52ec218a50fa22c16ca1e41270af3879b1123004354ff12132222e256383
-  data.tar.gz: 44b768f08c3d30ff311ece22978683a6ef1c6dcfcf5564fcd4275d7c7b08d4e210e2b1eec6fc6955179133c23621fd00f69d53951a5d4a35bbf8c6f818442201
+  metadata.gz: 32f4aed2b7910b2a3f0a405d248165c48cd94abeed5c2fdf01cfd711f51aa9d8aaa09628e8f9cc9b3049695f6343e6f11c814b8afafcc2681da361cf9b4cfa5e
+  data.tar.gz: dc924999be4ee8db979697cc0c1e12580703a6af0ac6933fbd225327d5c4f25a4584db4e176b3cfa8163b641d069c44ff388b0959b8d3ce30e389d98e6e3547b

data/Gemfile.lock

@@ -1,40 +1,14 @@
 PATH
   remote: .
   specs:
-    shufu (0.1.0)
-      dry-schema
+    shufu (0.1.4)
+      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.0)
-    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)
+    dry-initializer (3.1.1)
     power_assert (1.1.7)
     rake (13.0.6)
     rspec (3.10.0)

data/README.md

@@ -23,21 +23,18 @@ Or install it yourself as:
 ```ruby
 require "shufu"
 
-Shufu::Line.new(
-    "git commit",
-    {
-        schema: [
-            { name: "amend", type: option, flag: true },
-            { name: "author", type: option, equal: true }
-        ]
-    },
-    {
-        amend: true,
-        author: "cc-kawakami"
-    }
-).to_s
-
-# git commit --amend --author=cc-kawakami
+schema = [
+    { name: "git", type: "command" },
+    { name: "commit", type: "command" },
+    { name: "amend", type: "flag" },
+    { name: "author", type: "equal" }
+]
+
+command = Shufu::Command.new(schema)
+
+p command.to_s({ amend: true, 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

@@ -0,0 +1,35 @@
+module Shufu
+  class Command
+    #
+    # @param [Array<Hash>] schema
+    #
+    def initialize(schema)
+      @schema = schema.map { |s| Argument.new(**s) }
+    end
+
+    #
+    # @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.0"
+  VERSION = "0.1.4"
 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.0
+  version: 0.1.4
 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,9 +37,8 @@ files:
 - README.md
 - Rakefile
 - lib/shufu.rb
-- lib/shufu/item.rb
-- lib/shufu/line.rb
-- lib/shufu/schema.rb
+- lib/shufu/argument.rb
+- lib/shufu/command.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,23 +0,0 @@
-module Shufu
-  class InvalidSchemaError < RuntimeError; end
-
-  class Line
-    def initialize(main, schema, values)
-      @main = main
-      schema = Shufu::Schema.call(schema)
-      if schema.failure?
-        raise Shufu::InvalidSchemaError, schema.errors(full: true).to_h
-      end
-      @schema = schema
-      @values = values
-    end
-
-    def to_s
-      [@main, 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