scallop 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 350b01648cfd3ae1c8f431daeb9586e8720f629b2f3895f32d31b0334fdbb5a3
-  data.tar.gz: 5bf083a1baceeb1d1026fa4fb18e51ed6b6fb62a0be065ecf94596696805c091
+  metadata.gz: 2dac1c9873809c992d116dbf21c3e679f56c7b28abb27d39515d5794b8bf9d49
+  data.tar.gz: 03e036131a0daf08132f1f510c9b0efde5de15650764db0a417ddc0312b2a6fb
 SHA512:
-  metadata.gz: 69010f0366eaed9b2aa0011c6d9208bf59971d42462bb37da40199181d22219ca7e9ddeb209d49a0e98f7d75613b370627f1886e63818f651c143acf5977de58
-  data.tar.gz: 670d48fd373609ec1107ccf7a1a0d0d8f5fb373121d8e59bb12e77b4d9d6baf1663d0e21cd3d0b44a498c5fd0f1ff7ac7e7320c9dcdb206cd771e4a3735f9200
+  metadata.gz: af746113586125b22ee0b7940832cac5fcecde9c725575cedb93576b69a45672ca35335549131077419612e161852bc46684bf4603d4431c3ae361f0175ee5bc
+  data.tar.gz: 0df20b2e7544e886aa53569ecb8f85982ed9320d67220717b7feaef4abe110a8059b827e669bc9b609d7c0dd470406a2f62c16ba1a85d577fb20902733026c49

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/*.gem
 
 # rspec failure tracking
 .rspec_status

data/lib/scallop/version.rb

@@ -1,3 +1,3 @@
 class Scallop
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/scallop.rb

@@ -19,9 +19,9 @@ class Scallop
   end
 
   class Result < Hashie::Dash
-    property :stdout
-    property :stderr
-    property :status
+    property :stdout, required: true
+    property :stderr, required: true
+    property :status, required: true
 
     def self.from_capture3(result)
       stdout, stderr, status = result
@@ -38,6 +38,10 @@ class Scallop
     end
   end
 
+  class Param < Hashie::Dash
+    property :key, required: true
+  end
+
   class << self
     DSL_METHODS = %i{ cmd run run! sudo }
 
@@ -46,6 +50,14 @@ class Scallop
         new.public_send(method, *args)
       end
     end
+
+    def param(key)
+      Param.new(key: key)
+    end
+  end
+
+  def initialize
+    @params = {}
   end
 
   def sudo(sudo = true)
@@ -54,17 +66,17 @@ class Scallop
   end
 
   def cmd(*cmd)
-    @cmd =
-      [*cmd]
-        .map(&:to_s)
-        .map(&Shellwords.method(:escape))
-        .join(" ")
+    @cmd = cmd
+    self
+  end
 
+  def set(params)
+    @params.merge!(params)
     self
   end
 
   def to_command
-    raise ValidationFailed.new("cmd missing") if @cmd.nil?
+    raise Errors::ValidationFailed.new("cmd missing") if @cmd.nil?
 
     prefix =
       case @sudo
@@ -73,7 +85,22 @@ class Scallop
       else nil
       end
 
-    [prefix, @cmd].compact.join(" ")
+    cmd =
+      [*@cmd]
+        .map do |cmd_part|
+          case cmd_part
+          when Param
+            @params[cmd_part.key].tap do |value|
+              raise Errors::ValidationFailed.new("value for param '#{cmd_part.key}' not set") if value.nil?
+            end
+          else
+            cmd_part.to_s
+          end
+        end
+        .map(&Shellwords.method(:escape))
+        .join(" ")
+
+    [prefix, cmd].compact.join(" ")
   end
 
   def run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scallop
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - FetLife