update specs

Author: DannyBen

lib/bashly/concerns/validation_helpers.rb

@@ -35,19 +35,13 @@ def assert_array(key, value, of: nil)
       end
     end
 
-    def assert_hash(key, value, keys: nil, of: nil)
+    def assert_hash(key, value, keys: nil)
       assert value.is_a?(Hash), "#{key} must be a hash"
 
       if keys
         invalid_keys = value.keys.map(&:to_sym) - keys
         assert invalid_keys.empty?, "#{key} contains invalid options: #{invalid_keys.join ', '}"
       end
-
-      return unless of
-
-      value.each do |k, v|
-        send "assert_#{of}".to_sym, "#{key}.#{k}", v
-      end
     end
 
     def assert_uniq(key, value, array_keys)

spec/approvals/validations/command_dependencies_invalid_hash_command

@@ -0,0 +1 @@
+#<Bashly::ConfigurationError: root.dependencies.docker.command must be a string or an array>

spec/approvals/validations/command_dependencies_invalid_hash_help

@@ -0,0 +1 @@
+#<Bashly::ConfigurationError: root.dependencies.http_client.help must be a string>

spec/approvals/validations/command_dependencies_invalid_hash_keys

@@ -0,0 +1 @@
+#<Bashly::ConfigurationError: root.dependencies.docker contains invalid options: invalid_key>

spec/bashly/script/command_spec.rb

@@ -145,6 +145,15 @@
     end
   end
 
+  describe '#dependencies' do
+    let(:fixture) { :dependencies }
+
+    it 'returns an array of Dependency objects' do
+      expect(subject.dependencies).to be_an Array
+      expect(subject.dependencies.first).to be_a Script::Dependency
+    end
+  end
+
   describe '#environment_cariables' do
     it 'returns an array of EnvironemntVariable objects' do
       expect(subject.environment_variables).to be_an Array

spec/bashly/script/dependency_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+
+describe Script::Dependency do
+  subject do
+    options = load_fixture('script/commands')[fixture]
+    Script::Command.new(options).dependencies.first
+  end
+
+  let(:fixture) { :dependencies }
+
+  describe '::from_config' do
+    context 'with an unrecognized configuration' do
+      it 'returns an empty instahnce' do
+        expect(described_class.from_config('curl', 1)).to be_a described_class
+      end
+    end
+  end
+
+  describe '#label' do
+    context 'when initialized with a string' do
+      it 'returns the string' do
+        expect(subject.label).to eq 'curl'
+      end
+    end
+
+    context 'when initialized with a command => help hash' do
+      let(:fixture) { :dependencies_simple_hash }
+
+      it 'returns the command' do
+        expect(subject.label).to eq 'curl'
+      end
+    end
+
+    context 'when initialized with a label => config hash' do
+      let(:fixture) { :dependencies_full_hash }
+
+      it 'returns the label' do
+        expect(subject.label).to eq 'http_client'
+      end
+    end
+  end
+
+  describe '#commands' do
+    context 'when initialized with a string' do
+      it 'returns an array with that string as its only element' do
+        expect(subject.commands).to eq ['curl']
+      end
+    end
+
+    context 'when initialized with a command => help hash' do
+      let(:fixture) { :dependencies_simple_hash }
+
+      it 'returns an array with the command as its only element' do
+        expect(subject.commands).to eq ['curl']
+      end
+    end
+
+    context 'when initialized with a label => config hash' do
+      let(:fixture) { :dependencies_full_hash }
+
+      it 'returns the commands provided by the config' do
+        expect(subject.commands).to match_array %w[curl wget]
+      end
+    end
+  end
+
+  describe '#help' do
+    context 'when initialized with a string' do
+      it 'returns nil' do
+        expect(subject.help).to be_nil
+      end
+    end
+
+    context 'when initialized with a command => help hash' do
+      let(:fixture) { :dependencies_simple_hash }
+
+      it 'returns the provided help' do
+        expect(subject.help).to eq 'Please install curl'
+      end
+    end
+
+    context 'when initialized with a label => config hash' do
+      let(:fixture) { :dependencies_full_hash }
+
+      it 'returns the help provided by the config' do
+        expect(subject.help).to eq 'Please install curl or wget'
+      end
+    end
+  end
+
+  describe '#name' do
+    context 'when there is only one command' do
+      it 'returns it' do
+        expect(subject.name).to eq 'curl'
+      end
+    end
+
+    context 'when there are more than one commands' do
+      let(:fixture) { :dependencies_full_hash }
+
+      it 'returns a string suitable for the error message' do
+        expect(subject.name).to eq 'http_client (curl/wget)'
+      end
+    end
+  end
+end

spec/fixtures/script/commands.yml

@@ -166,6 +166,24 @@
     arg: format
     default: png
 
+:dependencies:
+  name: cli
+  dependencies:
+  - curl
+  - jq
+
+:dependencies_simple_hash:
+  name: cli
+  dependencies:
+    curl: Please install curl
+
+:dependencies_full_hash:
+  name: cli
+  dependencies:
+    http_client:
+      command: [curl, wget]
+      help: Please install curl or wget
+
 :docker:
   name: docker
   help: run docker commands

spec/fixtures/script/validations.yml

@@ -48,10 +48,6 @@
   name: invalid
   dependencies: 1
 
-:command_dependencies_invalid:
-  name: invalid
-  dependencies: 1
-
 :command_dependencies_invalid_array:
   name: invalid
   dependencies: [1, 2]
@@ -62,6 +58,25 @@
     docker: 1
     git: 2
 
+:command_dependencies_invalid_hash_command:
+  name: invalid
+  dependencies:
+    docker:
+      command: 1
+
+:command_dependencies_invalid_hash_help:
+  name: invalid
+  dependencies:
+    http_client:
+      command: [curl, wget]
+      help: 1
+
+:command_dependencies_invalid_hash_keys:
+  name: invalid
+  dependencies:
+    docker:
+      invalid_key: goes here
+
 :command_expose_invalid_type:
   name: invalid
   help: expose should be boolean or 'always'