dracula 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf8af3fa8ce0d0773e44cf93b3fe96c801ab73c9
-  data.tar.gz: 748c0857159a8f4f554c47c659a4ce39f481c5ac
+  metadata.gz: 9ef4fdc18122746e01e3149d3fdbc21d262649f0
+  data.tar.gz: 0a2953b9331e1488dbb11955f1fc9a9ace65a767
 SHA512:
-  metadata.gz: b419f1370ad664f0d74954ec949817a1523928f640db92917a74d196ec4eb7b47f4ccf25aded8f760623cff0442c4e6bc67cd45167572661eec7081b38087f0e
-  data.tar.gz: ee539053a23e58bf2de318da6418202e59135cb084c042a81711b623523813ba5b4f22337ed974e3bbcbef041aa98ae5f2a5640edee6b4213b1536f604cf5b0a
+  metadata.gz: 560efe1eb189a1b04726345375797e277893f401a40dff95983ab6f29f31da8fb4710746018a42c3e4d10fd3006ee7751e5473bd4d2b2f1099d8b7d63bf7acb8
+  data.tar.gz: 84316707c0cee5f937493abc316a67f052b51140cb46430eb6631fed9a1394b3da24a3f3ccc07b799f0cb1731eaddf9b1053dcc948a24ed03101cee0e4cb102c

data/lib/dracula.rb

@@ -3,6 +3,7 @@ require "optparse"
 
 class Dracula
   require "dracula/command"
+  require "dracula/flag"
   require "dracula/namespace"
   require "dracula/ui"
 
@@ -44,7 +45,7 @@ class Dracula
 
     def option(name, params = {})
       @options ||= []
-      @options << Command::Option.new(name, params)
+      @options << Dracula::Flag.new(name, params)
     end
 
     def long_desc(description)

data/lib/dracula/command.rb

@@ -3,46 +3,6 @@ class Dracula
 
     Desc = Struct.new(:name, :description)
 
-    class Option < Struct.new(:name, :params)
-
-      def short_name
-        params[:aliases]
-      end
-
-      def type
-        params[:type] || :string
-      end
-
-      def boolean?
-        type == :boolean
-      end
-
-      def has_default_value?
-        params.has_key?(:default) || boolean?
-      end
-
-      def default_value
-        if boolean?
-          params.key?(:default) ? params[:default] : false
-        else
-          params[:default]
-        end
-      end
-
-      def alias_name
-        params[:alias]
-      end
-
-      def banner
-        if alias_name.empty?
-          "--#{name}"
-        else
-          "-#{alias_name}, --#{name}"
-        end
-      end
-
-    end
-
     attr_reader :method_name
     attr_reader :desc
     attr_reader :options
@@ -89,11 +49,26 @@ class Dracula
       args  = params.take_while { |p| p[0] != "-" }
       flags = parse_flags(params.drop_while { |p| p[0] != "-" })
 
-      @klass.new(flags).public_send(method_name, *args)
+      missing_flags = missing_required_flags(flags)
+
+      if missing_flags.empty?
+        @klass.new(flags).public_send(method_name, *args)
+      else
+        puts "Required Parameter: --#{missing_flags.first.name}"
+        puts ""
+        help
+        exit(1)
+      end
     end
 
     private
 
+    def missing_required_flags(parsed_flags)
+      flags.select(&:required?).reject do |flag|
+        parsed_flags.keys.include?(flag.name)
+      end
+    end
+
     def parse_flags(args)
       parsed_flags = {}
 

data/lib/dracula/flag.rb

@@ -1,15 +1,12 @@
-module Dracula
-  class Flag
-    attr_reader :name
-    attr_reader :short_name
-    attr_reader :type
-
-    def initialize(name, params)
-      @name = name
-      @params = params
-
-      @short_name = params.fetch(:short)
-      @type = params.fetch(:type, :string)
+class Dracula
+  class Flag < Struct.new(:name, :params)
+
+    def type
+      params[:type] || :string
+    end
+
+    def required?
+      params[:required] == true
     end
 
     def boolean?
@@ -17,15 +14,30 @@ module Dracula
     end
 
     def has_default_value?
-      @params.key?(:default_value) || boolean?
+      params.has_key?(:default) || boolean?
     end
 
     def default_value
-      if type == :boolean
-        @params.key?(:default_value) || false
+      if boolean?
+        params.key?(:default) ? params[:default] : false
       else
-        @default_value
+        params[:default]
       end
     end
+
+    def alias_name
+      params[:alias]
+    end
+
+    alias_method :short_name, :alias_name
+
+    def banner
+      if alias_name.nil?
+        "--#{name}"
+      else
+        "-#{alias_name}, --#{name}"
+      end
+    end
+
   end
 end

data/lib/dracula/version.rb

@@ -1,3 +1,3 @@
 class Dracula
-  VERSION = "0.1.1".freeze
+  VERSION = "0.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dracula
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Igor Šarčević
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-18 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler