Merge pull request #212 from DannyBen/refactor/parse-requirements

Refactor parse_requirements views

Author: DannyBen

lib/bashly/script/command.rb

@@ -111,7 +111,12 @@ def parents
         options['parents'] || []
       end
 
-      # Returns trus if this is the root command (no parents)
+      # Returns true if one of the args is repeatable
+      def repeatable_arg_exist?
+        args.select(&:repeatable).any?
+      end
+
+      # Returns true if this is the root command (no parents)
       def root_command?
         parents.empty?
       end

lib/bashly/views/command/parse_requirements_case.erb

@@ -1,38 +1,8 @@
 <%= view_marker %>
-% repeatable_arg = false
-% if args.any?
-% condition = "if"
-% args.each do |arg|
-<%= condition %> [[ -z ${args[<%= arg.name %>]+x} ]]; then
-<%= arg.render(:validations).indent 2 %>
-% if arg.repeatable
-% repeatable_arg = true
-  args[<%= arg.name %>]="\"$1\""
-  shift
-else
-  args[<%= arg.name %>]="${args[<%= arg.name %>]} \"$1\""
-  shift
-% else
-  args[<%= arg.name %>]=$1
-  shift
-% end
-% condition = "elif"
-% end
-% if !repeatable_arg
-else
-% end
 % if catch_all.enabled?
-  other_args+=("$1")
-  shift
-% elsif !repeatable_arg
-  printf "<%= strings[:invalid_argument] %>\n" "$key"
-  exit 1
-% end
-fi
-% elsif catch_all.enabled?
-  other_args+=("$1")
-  shift
-% elsif !repeatable_arg
-printf "<%= strings[:invalid_argument] %>\n" "$key"
-exit 1
+<%= render(:parse_requirements_case_catch_all) %>
+% elsif repeatable_arg_exist?
+<%= render(:parse_requirements_case_repeatable) %>
+% else
+<%= render(:parse_requirements_case_simple) %>
 % end

lib/bashly/views/command/parse_requirements_case_catch_all.erb

@@ -0,0 +1,18 @@
+<%= view_marker %>
+% if args.any?
+% condition = "if"
+% args.each do |arg|
+<%= condition %> [[ -z ${args[<%= arg.name %>]+x} ]]; then
+<%= arg.render(:validations).indent 2 %>
+  args[<%= arg.name %>]=$1
+  shift
+% condition = "elif"
+% end
+else
+  other_args+=("$1")
+  shift
+fi
+% else
+other_args+=("$1")
+shift
+% end

lib/bashly/views/command/parse_requirements_case_repeatable.erb

@@ -0,0 +1,18 @@
+<%= view_marker %>
+% condition = "if"
+% args.each do |arg|
+<%= condition %> [[ -z ${args[<%= arg.name %>]+x} ]]; then
+<%= arg.render(:validations).indent 2 %>
+% if arg.repeatable
+  args[<%= arg.name %>]="\"$1\""
+  shift
+else
+  args[<%= arg.name %>]="${args[<%= arg.name %>]} \"$1\""
+  shift
+% else
+  args[<%= arg.name %>]=$1
+  shift
+% end
+% condition = "elif"
+% end
+fi

lib/bashly/views/command/parse_requirements_case_simple.erb

@@ -0,0 +1,18 @@
+<%= view_marker %>
+% if args.any?
+% condition = "if"
+% args.each do |arg|
+<%= condition %> [[ -z ${args[<%= arg.name %>]+x} ]]; then
+<%= arg.render(:validations).indent 2 %>
+  args[<%= arg.name %>]=$1
+  shift
+% condition = "elif"
+% end
+else
+  printf "<%= strings[:invalid_argument] %>\n" "$key"
+  exit 1
+fi
+% else
+printf "<%= strings[:invalid_argument] %>\n" "$key"
+exit 1
+% end

spec/bashly/script/command_spec.rb

@@ -242,6 +242,22 @@
     end
   end
 
+  describe '#repeatable_arg_exist?' do
+    context "when the command does not have any repeatable flags" do
+      it "returns false" do
+        expect(subject.repeatable_arg_exist?).to be false
+      end
+    end
+
+    context "when the command has at least one repeatable flag" do
+      let(:fixture) { :repeatable_arg }
+
+      it "returns true" do
+        expect(subject.repeatable_arg_exist?).to be true
+      end
+    end
+  end
+
   describe '#root_command?' do
     context "when the command has no parents" do
       it "returns true" do

spec/fixtures/script/commands.yml

@@ -179,3 +179,10 @@
 :filters_string:
   name: run
   filters: docker_running
+
+:repeatable_arg:
+  name: get
+  args:
+  - name: source
+  - name: target
+    repeatable: true