singularity_dsl 1.5.2 → 1.5.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2I3NmZkZDJkNmFhZTU1Zjc3ZDVjZDliMmQ3N2Y5Njk1MThhOTUxOQ==
+    MjIxMjE1MTRiOTY0ZDdiODRhOTYzMmY4NjFhNmEwN2M5NTkwNTI3NA==
   data.tar.gz: !binary |-
-    ZmZlYzdiZDcyZDY5OGMyZTk1YzVkOTFhYTI5NTZlNzJhZTFkY2IwYQ==
+    YTMzZThjMjc5NTA1MzlhY2IxM2NhYjEzMTRkZjdjMzk5MDViMWIyNg==
 SHA512:
   metadata.gz: !binary |-
-    M2FkNTUwMjA4ZTEyZjNmNjYwOTU1ZTNjNThjZWRhZWQzYWYwMGVkM2Y1NmQ3
-    MTYwNDlkMzM5ZTM1MzkyMTMxMjE1YWFlOTc4MTgxMzMxZmFiZjJiM2RlZmI1
-    MGVhYWUxMjE4ZTgxYmJlM2FiOTQ3Y2I1OTE1ZmU5Zjc5YmI3MWU=
+    NDYzOTU5NDgxNmNmMzFjNDY2ZGUyN2Q3ZjkxZGUxZmQzODRmYjI5Y2UyOTUy
+    ZDQ4MmM2YWQ0NDYxMWNkODAxM2JkZjViMDBmYzE5YTY4MmI5NjBiYjEwMzIw
+    N2YxMGU4ZDBkZDUwMzJmNzNkNDIzNTdlOWQzMjM1YzczZjY3ODY=
   data.tar.gz: !binary |-
-    MDEyODBiNmVjMmViZjQ3Y2M3NWQxYzc4Y2IyNWNkYjJmMWNlMGVkMjc1ZGMz
-    MDNmZjJhN2UzYjUzZTkxMDEwZmQzYTBmMmM5YTlhNjMxMGNmYjNkN2ZhZmQy
-    MTU4ZTAyNjUzYzZmZTlhM2ZkYmYzZDVlYTlkNzhlNDg2MWJjM2Y=
+    NDE1ZDUxNDYyOTc4MjdlMzEzNzBhMzI2NmFiZWJmOWUwOGUxODE1NDZmNDk2
+    Y2RiOThmOTQxOGU5ZDE1YTM1NzI0NzQ5N2M0NzA2YmI5NDYyNWU2N2ZjMjNm
+    MjY3NzA1NzczZWMyN2Q4MDYwNzFmOTE5MDM5NWY4NGFmNDkzMjA=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    singularity_dsl (1.5.2)
+    singularity_dsl (1.5.3)
       json (~> 1.0)
       mixlib-shellout (~> 1.6.0.rc.0)
       rainbow (~> 2.0.0)

data/lib/singularity_dsl/cli/cli.rb

@@ -23,6 +23,7 @@ module SingularityDsl
         super
         @diff_list = nil
         @git = GitHelper.new
+        @git.verbosity options[:verbose]
         env_vars(options[:env] || [])
       end
 
@@ -43,6 +44,9 @@ module SingularityDsl
       class_option :env,
                    type: :array,
                    desc: 'EnvVars to set, formatted as VAR:VAL'
+      class_option :verbose,
+                   type: :boolean,
+                   desc: 'Turn on verbose logging.'
       class_option :flags,
                    type: :array,
                    desc: <<-EOD

data/lib/singularity_dsl/git_helper.rb

@@ -1,14 +1,18 @@
 # encoding: utf-8
 
 require 'mixlib/shellout'
+require 'singularity_dsl/stdout'
 
 module SingularityDsl
   # wrapper class for rugged
   class GitHelper
-    attr_reader :dir
+    include SingularityDsl::Stdout
+
+    attr_reader :dir, :verbose
 
     def initialize
       throw 'git not installed' unless git_installed
+      @verbose = false
     end
 
     def clean_reset
@@ -37,7 +41,7 @@ module SingularityDsl
 
     def add_remote(url)
       remote = remote_from_url url
-      exec("git remote add #{remote} #{url}")
+      exec("git remote add #{remote} #{url}") if url
       fetch_all
     end
 
@@ -56,6 +60,11 @@ module SingularityDsl
       install_submodules
     end
 
+    def verbosity(level)
+      @verbose = level.is_a?(Fixnum) && level > 0
+      @verbose = level if level.is_a? TrueClass
+    end
+
     private
 
     def remote_cmd(branch, url, action)
@@ -100,6 +109,10 @@ module SingularityDsl
 
     def exec(cmd)
       task = Mixlib::ShellOut.new cmd
+      if @verbose
+        info cmd
+        task.live_stream = STDOUT
+      end
       task.run_command
       task.exitstatus
     end

data/lib/singularity_dsl/version.rb

@@ -2,5 +2,5 @@
 
 # version const for gem
 module SingularityDsl
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end

data/spec/singularity_dsl/git_helper_spec.rb

@@ -11,6 +11,10 @@ describe 'GitHelper' do
   let(:git) { SingularityDsl::GitHelper.new }
 
   context '#initialize' do
+    it 'sets verbose off' do
+      expect(git.verbose).to eql false
+    end
+
     it 'throws if git is not installed' do
       allow_any_instance_of(SingularityDsl::GitHelper)
         .to receive(:git_installed)
@@ -20,6 +24,28 @@ describe 'GitHelper' do
     end
   end
 
+  context '#verbosity' do
+    it 'sets verbose to true when number > 0 given' do
+      git.verbosity 1
+      expect(git.verbose).to eql true
+    end
+
+    it 'sets verbose to true when true given' do
+      git.verbosity true
+      expect(git.verbose).to eql true
+    end
+
+    it 'sets verbose to false when number == 0 given' do
+      git.verbosity 0
+      expect(git.verbose).to eql false
+    end
+
+    it 'sets verbose to false when non-Fixnum given' do
+      git.verbosity 'wat'
+      expect(git.verbose).to eql false
+    end
+  end
+
   context '#clean_reset' do
     it 'fails when reset fails' do
       allow(git).to receive(:reset).and_return(1)

data/spec/singularity_dsl/tasks/shell_task_spec.rb

@@ -94,6 +94,7 @@ describe 'ShellTask' do
     it 'runs alternative command' do
       cmd = 'echo "hi :)"'
       alt = 'echo "no"'
+      sh_task.live_stream = false
       sh_task.command cmd
       sh_task.alt alt
       sh_task.condition 'ls -z'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singularity_dsl
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - chr0n1x