shufu 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b858f08ebaa7dcca08a410c5352d5ad773485b71aeb07b4078f883d5bb2eb2b
-  data.tar.gz: f469e1608aee7b62c8e934ebcaae0f5ce5d81b26fd1dce051da290f30253ee43
+  metadata.gz: 17364e473508ee305a2ce5ca29833014f474deeec7123fb5aceeb4a39e0a8928
+  data.tar.gz: 07da5c874f8b7ead3e9bcb3389cda4bca000e400afde8733b7445eb5624680df
 SHA512:
-  metadata.gz: 403fff19b0e2d2f76ff27eb5d2dd367562cd689c7be74a63bc9965ff03173235e9e7d5d6611bb3f8583b19c32ffce5e3e6872d61d05c3ea3f50a4ac82320c039
-  data.tar.gz: 2274385325d2f3e43e8133933c9aa0b4ea0420f4786ebf2653adc120363f7c0084321dfa62a88c33b67bea414e2b0ed5257ed69ff63e8cd08f55395ca2224898
+  metadata.gz: 0cadcc2fefaab6555da37f4e7be336e27ff79724a41cc648d97c9ec6a5d2fc5a33d791afafec7b97cc7e80dd34515e60eeb069c95515302ed5afcd07730e5338
+  data.tar.gz: f9035d6846f3a66e619bb6f49d5cbf2387b4ff1928ad61f6a35a00b021dfb326baf6511937ae62baa5fc8f78eaa5015ed885d9271cc84f4168d0182803e70fe3

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    shufu (0.1.2)
+    shufu (0.1.3)
+      dry-initializer
       dry-schema
 
 GEM

data/README.md

@@ -23,12 +23,12 @@ Or install it yourself as:
 ```ruby
 require "shufu"
 
-schema = [
-    { name: "amend", type: option, flag: true },
-    { name: "author", type: option, equal: true }
+arguments = [
+    { name: "amend", type: "flag" },
+    { name: "author", type: "equal" }
 ]
 
-command = Shufu::Command.new("git commit", schema)
+command = Shufu::Command.new("git commit", arguments)
 
 p command.line({ amend: true, author: "cc-kawakami" })
 

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 { :param }
+
+    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

@@ -4,11 +4,7 @@ module Shufu
   class Command
     def initialize(base, schema)
       @base = base
-      schema = Shufu::Schema.call({ schema: schema })
-      if schema.failure?
-        raise Shufu::InvalidSchemaError, schema.errors(full: true).to_h
-      end
-      @schema = schema.to_h[:schema]
+      @schema = schema.map { |s| Argument.new(**s) }
     end
 
     def line(values)

data/lib/shufu/line.rb

@@ -7,11 +7,11 @@ module Shufu
     end
 
     def to_s
-      [@base, items].flatten.join(" ")
-    end
-
-    def items
-      @values.map { |k, v| Shufu::Item.new(@schema, k, v).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

data/lib/shufu/version.rb

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

data/shufu.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   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.2
+  version: 0.1.3
 platform: ruby
 authors:
 - cc-kawakami
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-initializer
+  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'
 description: Shufu is a simple command line generator
 email:
 - kawakami-moeki@colorfulcompany.co.jp
@@ -37,10 +51,9 @@ 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.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/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