machine_configure 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ccd8db9cf4911d7c39b8a1a60e2aef90f38798437bcb1e6f463c9977fcc369f
-  data.tar.gz: 073d2219e21ec95877111f79cc430da279dd1fb8551e94f82f072d3478fc8d6e
+  metadata.gz: 06ef93f9530db48a7db44d49b441113df4f1e067a07a60a73b13fcf1325523aa
+  data.tar.gz: b618dabc8e2d8fbef51b19d399658fa89850feed80578cdad3315a2e6cbf56a2
 SHA512:
-  metadata.gz: 6a9ef77ddcef9d115d2e796fe0493a4f1623ac65adb5e46dac1f7f138a23bc5c8b24e66060c682041b11414d3aea6236d8eff298b89b66332dbf5ec5dc82fc9a
-  data.tar.gz: 3ea90114839e8c543de8ee78678a0e97d8e8e3384cdc5970ea636a1ad90888775b52c8d46a588b791c48cd4214374c48657e0af51d0b885cf0abd0ce1335af3c
+  metadata.gz: 242859e7737e8e29983c379d72f5bdbed420f5d26f086397c823f118d98da51df9c4402cd29203ba111c38f8f33a5c98432fc5db2e74a6e652903e2d71ecd9c5
+  data.tar.gz: e4fe37d37a2e72b9a24ec17d7c72ebf18a4cec9cf6146c591bf3fb41bb04180bd8efa09630e1aca81d0c54b96583671a87b14caf67526d62667abb6dac8b8ceb

data/Gemfile

@@ -2,6 +2,4 @@ source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
-gem 'argument_parser', git: 'https://github.com/Noah2610/ArgumentParser'
-
 gemspec

data/Gemfile.lock

@@ -1,13 +1,7 @@
-GIT
-  remote: https://github.com/Noah2610/ArgumentParser
-  revision: 3ac5b0083fd42ae8740d1d22d988f56c74a29470
-  specs:
-    argument_parser (1.0.0)
-
 PATH
   remote: .
   specs:
-    machine_configure (0.0.1)
+    machine_configure (0.0.2)
       rubyzip (~> 1.2)
 
 GEM
@@ -22,7 +16,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  argument_parser!
   bundler (~> 1.16)
   machine_configure!
   minitest (~> 5.0)

data/lib/argument_parser.rb

@@ -0,0 +1,112 @@
+####################################################
+## Simple command-line arguments / options parser ##
+##  https://github.com/Noah2610/ArgumentParser    ##
+####################################################
+
+class ArgumentParser
+	def self.get_arguments valid_args = {}
+		return nil  if (valid_args.nil? || valid_args.empty?)
+
+		ret = {
+			options:  {},
+			keywords: {}
+		}
+
+		set_opt_val_of = nil
+		set_kw_val_of = nil
+		cur_kw_chain = nil
+		read_user_inputs = false
+		## Loop through all command-line arguments
+		ARGV.each do |argument|
+
+			## Check valid SINGLE options
+			if (argument =~ /\A-[\w\d]+\z/)
+				## Get all options of argument
+				cur_opts = argument.sub(/\A-/,"").split("")
+				valid_args[:single].each do |id, val|
+					## Loop through every command-line option of current argument
+					#  ex.: -abc -> a,b,c
+					cur_opts.each do |opt|
+						if (val.first.include? opt)
+							## Check if option takes value
+							if (val.last)
+								ret[:options][id] = nil
+								set_opt_val_of = id
+							else
+								ret[:options][id] = true
+							end
+						end
+					end
+				end
+
+			## Check valid DOUBLE options
+			elsif (argument =~ /\A--[\w\d\-]+\z/)
+				cur_opt = argument.sub(/\A--/,"")
+				valid_args[:double].each do |id, val|
+					if (val.first.include? cur_opt)
+						## Check if option takes value
+						if (val.last)
+							ret[:options][id] = nil
+							set_opt_val_of = id
+						else
+							ret[:options][id] = true
+						end
+					end
+				end
+
+			## Check valid KEYWORDS or values
+			elsif !(argument =~ /\A-{1,2}/)
+				## Set value of previously found option
+				if (set_opt_val_of)
+					ret[:options][set_opt_val_of] = argument
+					set_opt_val_of = nil
+					next
+				elsif (set_kw_val_of)
+					ret[:keywords][set_kw_val_of] << argument
+					set_kw_val_of = nil
+					next
+				end
+
+				## Check if in kw-chain or for valid keyword
+				if (cur_kw_chain.nil?)
+					valid_args[:keywords].each do |id, val|
+						if ([:INPUT, :INPUTS].include?(val.first) || val.first.include?(argument))
+							ret[:keywords][id] = [argument]
+							cur_kw_chain = id
+							break
+						end
+					end
+				else
+					## Check if argument is valid for next kw in kw-chain
+					kw_chain_index = ret[:keywords][cur_kw_chain].size
+					## Read unlimited custom user input
+					if (read_user_inputs)
+						ret[:keywords][cur_kw_chain] << argument
+						next
+					else
+						## If not unlimited custom user input and argument's length has exceeded
+						## keyword-chain's possible length, then skip
+						next  if (kw_chain_index >= valid_args[:keywords][cur_kw_chain].size)
+					end
+					if    (valid_args[:keywords][cur_kw_chain][kw_chain_index] == :INPUT)
+						## Custom user input (single)
+						ret[:keywords][cur_kw_chain] << argument
+
+					elsif (valid_args[:keywords][cur_kw_chain][kw_chain_index] == :INPUTS)
+						## Custom user input (unlimited)
+						ret[:keywords][cur_kw_chain] << argument
+						read_user_inputs = true
+
+					else
+						if (valid_args[:keywords][cur_kw_chain][kw_chain_index].include? argument)
+							ret[:keywords][cur_kw_chain] << argument
+						end
+					end
+				end
+			end
+
+		end  # end arguments loop
+
+		return ret
+	end
+end

data/lib/machine_configure.rb

@@ -1,5 +1,4 @@
 require 'bundler/setup'
-require 'argument_parser'
 require 'fileutils'
 require 'pathname'
 require 'zip'
@@ -43,6 +42,7 @@ module MachineConfigure
   DM_BACKUP_CERTS_PATH    = DM_BACKUP_PATH.join('certs')
 
   require DIR[:src].join     'meta'
+  require DIR[:root].join    'argument_parser'
   require DIR[:helpers].join 'shared'
   require DIR[:helpers].join 'message'
   require DIR[:src].join     'validator'

data/lib/machine_configure/meta.rb

@@ -1,4 +1,4 @@
 module MachineConfigure
   GEM_NAME = 'machine_configure'
-  VERSION  = '0.0.1'
+  VERSION  = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: machine_configure
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Noah Rosenzweig
@@ -102,6 +102,7 @@ files:
 - bin/rdoc
 - bin/setup
 - exe/maccon
+- lib/argument_parser.rb
 - lib/machine_configure.rb
 - lib/machine_configure/cli.rb
 - lib/machine_configure/cli_constants.rb