singularity_dsl 1.6.3 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTEyYmQzY2NkMDJmOTc3Yjk3NDVkMGVlNGYzNDAxM2E1ODVlZTU4NA==
+    ODFhM2I0MWY1MzZjYTllMTBhOTk5NjU5OWRkMTRlOWMyNmI3ZDM4MA==
   data.tar.gz: !binary |-
-    NTFhNzNkMjVjYThkMDJjNmQwYjAwYTMwMjNjOTE4ZjBhMTYxOWRlMQ==
+    ZjJlZDBlZTNhYTkwOWJlMDEyYjI0ZjYwODg2ZDMyN2Q3ZTJiNzBhZQ==
 SHA512:
   metadata.gz: !binary |-
-    MGE1MGVlZDg0MGY4NDY2ZGU2OTgxNzM4MjQzNTg5OWFhNTBmMzhlMzE1MjNi
-    MTVmOGQ1M2NhOWFhNzVjYzViMjIxZTkyZjY5ZDM5M2RhYWNlMzBhYTlhZWJm
-    NTNhNmUxZGZjOWIyODg3NTQxZjE0OTc0NGIwMDY0ZDg2M2U4MTU=
+    MjEwNzEzNDdiMGExZTk5OWU2NTAyYjgyYmFlOTBhZmU1YzVhMzAwZTNiOGYx
+    NDMzNzAzM2VlNzZmMTlmYTFjODAxNTI0MjkzZjc1Zjg2YmUwNzA4YzQzYTk2
+    OTdiMWY1ZTVmMDNmNjgxOWJkNjMzZTA0ZDg1ODMwYTYzNzRjY2I=
   data.tar.gz: !binary |-
-    Njc2OWNmNzFjMmFiMDczZTQ1ZmY1ZjFjMTQ0YmEzODRiZmViNThjM2ZiNDEw
-    ODA2YTU2ZDRmNDJjZjNiMGVkN2VlNzFiNWU4ZWY4YmEyMjk5OGRmMmQ5NjAy
-    ZTg2Y2ZlYmMzYzc1NDk2ZGZiZTk5MDVmZDg1ZWJlOWI2ZDgwNmM=
+    MzQyNGNmY2FjMjcwNDQyMTZhZjljZTU0ZWNkYzhhZWY5ZDhjNTgwM2QwZGRj
+    M2VjOWE2ZWNjZWRhMmY3ZjQyZGY5ODNlOWQxNzRlNmFmZjU1ZTRjOTY4ZWIz
+    YzNlY2I0NDBkNjQyNTU5NWRkZjE0YzAwODRkZmNhNjMwZTc1MTA=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    singularity_dsl (1.6.3)
+    singularity_dsl (2.0.0)
       coveralls (~> 0.7.9)
       json (~> 1.0)
       mixlib-shellout (~> 2.0)
@@ -18,7 +18,7 @@ GEM
     ast (2.0.0)
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
-    coveralls (0.7.10)
+    coveralls (0.7.11)
       multi_json (~> 1.10)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.9.1)
@@ -30,8 +30,8 @@ GEM
     json (1.8.2)
     mime-types (2.4.3)
     mixlib-shellout (2.0.1)
-    multi_json (1.10.1)
-    netrc (0.10.2)
+    multi_json (1.11.0)
+    netrc (0.10.3)
     parser (2.2.0.3)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.0)
@@ -44,15 +44,15 @@ GEM
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.0)
+    rspec-core (3.2.1)
       rspec-support (~> 3.2.0)
     rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.0)
+    rspec-mocks (3.2.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.2.0)
-    rspec-support (3.2.1)
+    rspec-support (3.2.2)
     rubocop (0.29.1)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.1, < 3.0)
@@ -69,7 +69,7 @@ GEM
       tins (~> 1.0)
     terminal-table (1.4.5)
     thor (0.19.1)
-    tins (1.3.4)
+    tins (1.3.5)
 
 PLATFORMS
   ruby

data/bin/singularity_runner

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'singularity_dsl/cli/cli'
+require 'singularity_dsl/cli'
 SingularityDsl::Cli::Cli.start

data/lib/singularity_dsl/application.rb

@@ -45,7 +45,6 @@ module SingularityDsl
     end
 
     def change_list(list)
-      list = list.split("\n") if list.is_a? String
       list = [*list]
       list.sort!
       @runner.dsl.changeset = list

data/lib/singularity_dsl/cli/command/app_runner_command.rb

@@ -0,0 +1,56 @@
+# encoding: utf-8
+
+require 'singularity_dsl/application'
+require 'singularity_dsl/cli/command/command'
+require 'singularity_dsl/stdout'
+
+module SingularityDsl
+  module Cli
+    module Command
+      # base command that runs application instances
+      class AppRunnerCommand < Command
+        include SingularityDsl::Stdout
+
+        def initialize_app
+          SingularityDsl::Application.new.tap do |app|
+            inject_flags app, user_flags
+            if tasks_path
+              info "Loading tasks from #{tasks_path}"
+              app.load_tasks tasks_path
+            end
+            info "Loading CI script from #{singularity_script} ..."
+            app.load_script singularity_script
+          end
+        end
+
+        private
+
+        def user_flags
+          options[:flags] || []
+        end
+
+        def script
+          options[:script]
+        end
+
+        def script_path_exists?
+          !script.nil? && ::File.exist?(script)
+        end
+
+        def singularity_script
+          fail "Invalid script given: #{script}" unless script_path_exists?
+          ::File.expand_path script
+        end
+
+        def inject_flags(app, flags = [])
+          flags.each do |pair|
+            key = pair.split(':', 2).first
+            val = pair.split(':', 2).last
+            app.runner.dsl.flag key if key == val
+            app.runner.dsl.flag key, val unless key == val
+          end
+        end
+      end
+    end
+  end
+end

data/lib/singularity_dsl/cli/command/command.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+module SingularityDsl
+  module Cli
+    module Command
+      # base command class
+      # options are just a hash
+      # (preferably passed in from Cli::Cli via Thor)
+      class Command
+        attr_reader :options
+
+        def initialize(opts = {})
+          @options = opts
+        end
+
+        def execute
+          fail 'cannot execute a base Command'
+        end
+
+        def tasks_path
+          return false unless task_path_exists
+          expanded_path
+        end
+
+        private
+
+        def given_path
+          options[:task_path]
+        end
+
+        def expanded_path
+          ::File.expand_path given_path
+        end
+
+        def task_path_exists
+          !given_path.nil? && ::File.exist?(given_path)
+        end
+      end
+    end
+  end
+end

data/lib/singularity_dsl/cli/command/tasks.rb

@@ -0,0 +1,66 @@
+# encoding: utf-8
+
+require 'singularity_dsl/cli/command/command'
+require 'singularity_dsl/dsl/dsl'
+require 'singularity_dsl/stdout'
+
+require 'rainbow'
+require 'terminal-table'
+
+module SingularityDsl
+  module Cli
+    module Command
+      # tasks command
+      # Prints out known tasks in the given task path
+      class Tasks < Command
+        include SingularityDsl::Stdout
+
+        def execute
+          dsl = SingularityDsl::Dsl::Dsl.new
+          dsl.load_tasks_in_path tasks_path if tasks_path
+          table = task_table
+          dsl.task_list.each do |task|
+            task_rows(dsl, task).each { |row| table.add_row row }
+          end
+          data table
+        end
+
+        private
+
+        def task_table
+          headers = [
+            Rainbow('Task').yellow,
+            Rainbow('Task Function').yellow,
+            Rainbow('Description').yellow
+          ]
+          table = ::Terminal::Table.new headings: headers
+          table.style = { border_x: '', border_y: '', border_i: '' }
+          table
+        end
+
+        def desc_rows(desc)
+          desc_lines = []
+          line = ''
+          desc.split(' ').each do |word|
+            if (line + word).length > 80
+              desc_lines.push line.strip
+              line = ''
+            end
+            line += " #{word}"
+          end
+          desc_lines.push line.strip
+          desc_lines
+        end
+
+        def task_rows(dsl, task_class)
+          desc_lines = desc_rows task_class.new.description
+          name = dsl.task_name task_class
+          task_name = dsl.task task_class
+          rows = [[name, task_name, desc_lines.shift]]
+          desc_lines.each { |line| rows.push ['', '', line] }
+          rows
+        end
+      end
+    end
+  end
+end

data/lib/singularity_dsl/cli/command/test.rb

@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+require 'singularity_dsl/cli/command/app_runner_command'
+
+module SingularityDsl
+  module Cli
+    module Command
+      # CLI test command - actually runs the entire application
+      # with or without a batch
+      class Test < AppRunnerCommand
+        def execute
+          app = initialize_app
+          # Exposes the app that is created so that child classes
+          # can perform injections / configurations on the fly
+          yield(app) if block_given?
+          exit(app.run batch, options[:all_tasks])
+        end
+
+        def batch
+          options[:batch] || false
+        end
+      end
+    end
+  end
+end

data/lib/singularity_dsl/cli/command/test_merge.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+
+require 'singularity_dsl/cli/command/test'
+require 'singularity_dsl/git_helper'
+
+module SingularityDsl
+  module Cli
+    module Command
+      # testmerge command
+      # perform a merge, inject a changeset, run test command
+      class TestMerge < Test
+        attr_reader :git, :diff_list
+
+        def initialize(options)
+          super options
+          @diff_list = []
+          @git = SingularityDsl::GitHelper.new
+          @git.verbosity options[:verbose]
+        end
+
+        def perform_merge(git_fork, branch, base_branch, base_fork = nil)
+          git.merge_refs git_fork, branch, base_branch, base_fork
+          @diff_list += get_diff_list(base_branch, base_fork)
+          remove_remotes git_fork, base_fork
+          self
+        end
+
+        def execute
+          super { |app| inject_diff_list app }
+        end
+
+        def batch
+          target = options[:run_task]
+          target = false if target.nil? || target.strip.eql?('')
+          target
+        end
+
+        private
+
+        def inject_diff_list(app)
+          return if diff_list.empty?
+          info 'Running with diff-list'
+          list_items diff_list
+          app.change_list diff_list
+        end
+
+        def get_diff_list(ref, url)
+          git.diff_remote ref, url, '--name-only'
+        end
+
+        def remove_remotes(*urls)
+          urls.each { |url| git.remove_remote url }
+        end
+      end
+    end
+  end
+end

data/lib/singularity_dsl/cli/command.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+require 'singularity_dsl/cli/command/tasks'
+require 'singularity_dsl/cli/command/test'
+require 'singularity_dsl/cli/command/test_merge'

data/lib/singularity_dsl/cli.rb

@@ -0,0 +1,89 @@
+# encoding: utf-8
+
+require 'singularity_dsl/cli/command'
+require 'singularity_dsl/version'
+
+require 'thor'
+
+module SingularityDsl
+  module Cli
+    # CLI (Thor) interface for CLI commands
+    class Cli < Thor
+      class_option :task_path,
+                   aliases: '-t',
+                   type: :string,
+                   desc: 'Directory where custom tasks are defined',
+                   default: './.singularity'
+      class_option :all_tasks,
+                   aliases: '-a',
+                   type: :boolean,
+                   desc: 'Do not stop on task failure(s), collect all results'
+      class_option :script,
+                   aliases: '-s',
+                   type: :string,
+                   desc: 'Specify path to a .singularityrc file',
+                   default: './.singularityrc'
+      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
+Runtime flags to set for use with flag_set?, formatted as VAR:VAL
+EOD
+
+      def initialize(*args)
+        super
+        env_vars(options[:env] || [])
+      end
+
+      map %w(--version -v) => :__print_version
+      desc '--version, -v', 'print the version'
+      def __print_version
+        puts "Singularity Runner & DSL v#{::SingularityDsl::VERSION}"
+      end
+
+      desc 'tasks', 'Available tasks.'
+      def tasks
+        Command::Tasks.new(options).execute
+      end
+
+      desc 'test', 'Run singularity script.'
+      def test
+        Command::Test.new(options).execute
+      end
+
+      desc 'batch BATCH_NAME',
+           'Run single task batch in the .singularityrc script.'
+      def batch(batch)
+        Command::Test.new(options.merge(batch: batch).freeze).execute
+      end
+
+      desc 'testmerge FORK BRANCH INTO_BRANCH [INTO_FORK]',
+           'Perform a testmerge into the local repo and then run .singularityrc'
+      option :run_task,
+             aliases: '-r',
+             type: :string,
+             desc: 'Run a batch instead, after testmerge.',
+             default: ''
+      def testmerge(git_fork, branch, base_branch, base_fork = nil)
+        Command::TestMerge.new(options)
+          .perform_merge(git_fork, branch, base_branch, base_fork)
+          .execute
+      end
+
+      private
+
+      def env_vars(vals)
+        vals.each do |pair|
+          key = pair.split(':', 2).first
+          val = pair.split(':', 2).last
+          ENV[key] = val
+        end
+      end
+    end
+  end
+end

data/lib/singularity_dsl/git_helper.rb

@@ -36,7 +36,7 @@ module SingularityDsl
       cmd = remote_cmd branch, url, "diff #{flags}"
       task = Mixlib::ShellOut.new cmd
       task.run_command
-      task.stdout
+      task.stdout.split("\n").map(&:strip)
     end
 
     def add_remote(url)

data/lib/singularity_dsl/tasks/rake.rb

@@ -6,12 +6,6 @@ require 'rake'
 class Rake < Task
   attr_accessor :target, :rake
 
-  def initialize(&block)
-    ::Rake.application.init
-    @rake = ::Rake.application
-    super(&block)
-  end
-
   def target(target)
     @target = target
     @target.strip!
@@ -19,8 +13,10 @@ class Rake < Task
 
   def execute
     throw 'target is required' if @target.nil?
-    @rake.load_rakefile
-    ret = @rake[@target].invoke
+    ::Rake.application.init
+    rake = ::Rake.application
+    rake.load_rakefile
+    ret = rake[@target].invoke
     return ret.count if ret.is_a? Array
     ret
   end

data/lib/singularity_dsl/version.rb

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

data/spec/singularity_dsl/cli/cli_spec.rb

@@ -1,27 +1,23 @@
 # encoding: utf-8
 
-require 'singularity_dsl/cli/cli'
+require 'singularity_dsl/cli'
+require 'singularity_dsl/cli/command'
 
 describe 'Cli' do
   let(:cli) { SingularityDsl::Cli::Cli.new }
 
-  context '#testmerge' do
-    before(:each) do
-      expect(cli.git).to receive(:merge_refs)
-      expect(cli).to receive(:diff_list)
-      expect(cli).to receive(:remove_remotes)
-    end
+  before :each do
+    @cmd_double = double
+    allow(@cmd_double).to receive :execute
+  end
 
-    it 'runs test method if no run_task' do
-      allow(cli).to receive(:target_run_task).and_return(false)
-      expect(cli).to receive(:test)
-      cli.testmerge 'fork', 'fork_branch', 'base_branch'
-    end
+  describe '#batch' do
+    it 'injects batch name directly into options' do
+      expect(SingularityDsl::Cli::Command::Test).to receive(:new)
+        .with(hash_including('batch' => 'foo'))
+        .and_return(@cmd_double)
 
-    it 'runs batch method if no run_task' do
-      allow(cli).to receive(:target_run_task).and_return('test_batch')
-      expect(cli).to receive(:batch)
-      cli.testmerge 'fork', 'fork_branch', 'base_branch'
+      cli.batch 'foo'
     end
   end
 end

data/spec/singularity_dsl/cli/command/app_runner_command_spec.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+
+require 'singularity_dsl/cli/command/app_runner_command'
+
+describe SingularityDsl::Cli::Command::AppRunnerCommand do
+  let(:cmd) { SingularityDsl::Cli::Command::AppRunnerCommand.new }
+
+  describe '#initialize_app' do
+    context 'no script given' do
+      it 'fails' do
+        expect { cmd.initialize_app }.to raise_error(/Invalid script/)
+      end
+    end
+
+    context 'a script is given' do
+      let(:script) { 'path/to/a/singularity/script' }
+      let(:cfg) { { script: script } }
+      let(:cmd) do
+        SingularityDsl::Cli::Command::AppRunnerCommand.new cfg
+      end
+
+      context 'and it is an invalid path' do
+        before :each do
+          # TODO: this may be indicative of a must larger problem...
+          allow(::File).to receive(:exist?).and_return false
+        end
+
+        it 'fails' do
+          expect { cmd.initialize_app }.to raise_error(/Invalid script/)
+        end
+      end
+    end
+  end
+end

data/spec/singularity_dsl/cli/command/command_spec.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+
+require 'singularity_dsl/cli/command/command'
+
+describe SingularityDsl::Cli::Command::Command do
+  let(:cmd) { SingularityDsl::Cli::Command::Command.new }
+
+  describe '#initialize' do
+    it 'sets default options to {}' do
+      expect(cmd.options).to eql({})
+    end
+  end
+
+  describe '#execute' do
+    it 'fails' do
+      expect { cmd.execute }.to raise_error(/cannot execute/)
+    end
+  end
+
+  describe '#tasks_path' do
+    context 'no path given in options' do
+      it 'returns false' do
+        expect(cmd.tasks_path).to eql false
+      end
+    end
+
+    context 'path given in options' do
+      let(:file) { 'some/file/dir/path/thing/given' }
+      let(:cmd) { SingularityDsl::Cli::Command::Command.new task_path: file }
+
+      context 'and path exists' do
+        let(:expanded_file) { '/expanded/some/file/dir/path/thing/given' }
+        before :each do
+          allow(::File).to receive(:exist?)
+            .with(file).and_return true
+          allow(::File).to receive(:expand_path)
+            .with(file).and_return expanded_file
+        end
+
+        it 'returns expanded path' do
+          expect(cmd.tasks_path).to eql expanded_file
+        end
+      end
+
+      context 'and path does not exist' do
+        before :each do
+          allow(::File).to receive(:exist?)
+            .with(file).and_return false
+        end
+
+        it 'returns expanded path' do
+          expect(cmd.tasks_path).to eql false
+        end
+      end
+    end
+  end
+end

data/spec/singularity_dsl/cli/command/tasks_spec.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+require 'singularity_dsl/cli/command/tasks'
+
+describe SingularityDsl::Cli::Command::Tasks do
+  describe '#execute' do
+    let(:cmd) { SingularityDsl::Cli::Command::Tasks.new }
+
+    it 'prints out a table of built-in tasks' do
+      # this is...kind of hard to test
+      expect(cmd).to receive(:data)
+      cmd.execute
+    end
+  end
+end

data/spec/singularity_dsl/cli/command/test_merge_spec.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+require 'singularity_dsl/cli/command/test_merge'
+
+describe SingularityDsl::Cli::Command::TestMerge do
+  describe '#batch' do
+    context ':run_task given' do
+      let(:cmd) { SingularityDsl::Cli::Command::TestMerge.new(run_task: 'foo') }
+
+      it 'returns batch' do
+        expect(cmd.batch).to eql 'foo'
+      end
+    end
+
+    context ':run_task not given' do
+      let(:cmd) { SingularityDsl::Cli::Command::TestMerge.new(run_task: '') }
+
+      it 'returns false when :run_task is an empty string' do
+        expect(cmd.batch).to eql false
+      end
+    end
+  end
+end

data/spec/singularity_dsl/cli/command/test_spec.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+require 'singularity_dsl/cli/command/test'
+
+describe SingularityDsl::Cli::Command::Test do
+  describe '#batch' do
+    context ':batch given in options' do
+      let(:cmd) { SingularityDsl::Cli::Command::Test.new(batch: 'foo') }
+
+      it 'returns the given value' do
+        expect(cmd.batch).to eql 'foo'
+      end
+    end
+
+    context ':batch not given' do
+      let(:cmd) { SingularityDsl::Cli::Command::Test.new }
+
+      it 'returns the given value' do
+        expect(cmd.batch).to eql false
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: singularity_dsl
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 2.0.0
 platform: ruby
 authors:
 - chr0n1x
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -184,9 +184,13 @@ files:
 - bin/singularity_runner
 - lib/singularity_dsl.rb
 - lib/singularity_dsl/application.rb
-- lib/singularity_dsl/cli/cli.rb
-- lib/singularity_dsl/cli/table.rb
-- lib/singularity_dsl/cli/utils.rb
+- lib/singularity_dsl/cli.rb
+- lib/singularity_dsl/cli/command.rb
+- lib/singularity_dsl/cli/command/app_runner_command.rb
+- lib/singularity_dsl/cli/command/command.rb
+- lib/singularity_dsl/cli/command/tasks.rb
+- lib/singularity_dsl/cli/command/test.rb
+- lib/singularity_dsl/cli/command/test_merge.rb
 - lib/singularity_dsl/dsl/batch.rb
 - lib/singularity_dsl/dsl/changeset.rb
 - lib/singularity_dsl/dsl/components.rb
@@ -210,6 +214,11 @@ files:
 - singularity_dsl.gemspec
 - spec/singularity_dsl/application_spec.rb
 - spec/singularity_dsl/cli/cli_spec.rb
+- spec/singularity_dsl/cli/command/app_runner_command_spec.rb
+- spec/singularity_dsl/cli/command/command_spec.rb
+- spec/singularity_dsl/cli/command/tasks_spec.rb
+- spec/singularity_dsl/cli/command/test_merge_spec.rb
+- spec/singularity_dsl/cli/command/test_spec.rb
 - spec/singularity_dsl/dsl/batch_spec.rb
 - spec/singularity_dsl/dsl/changeset_spec.rb
 - spec/singularity_dsl/dsl/dsl_spec.rb
@@ -251,6 +260,11 @@ summary: ''
 test_files:
 - spec/singularity_dsl/application_spec.rb
 - spec/singularity_dsl/cli/cli_spec.rb
+- spec/singularity_dsl/cli/command/app_runner_command_spec.rb
+- spec/singularity_dsl/cli/command/command_spec.rb
+- spec/singularity_dsl/cli/command/tasks_spec.rb
+- spec/singularity_dsl/cli/command/test_merge_spec.rb
+- spec/singularity_dsl/cli/command/test_spec.rb
 - spec/singularity_dsl/dsl/batch_spec.rb
 - spec/singularity_dsl/dsl/changeset_spec.rb
 - spec/singularity_dsl/dsl/dsl_spec.rb

data/lib/singularity_dsl/cli/cli.rb

@@ -1,137 +0,0 @@
-# encoding: utf-8
-
-require 'singularity_dsl/application'
-require 'singularity_dsl/cli/table'
-require 'singularity_dsl/cli/utils'
-require 'singularity_dsl/dsl/dsl'
-require 'singularity_dsl/errors'
-require 'singularity_dsl/git_helper'
-require 'singularity_dsl/version'
-require 'thor'
-
-module SingularityDsl
-  # CLI
-  module Cli
-    # CLI Thor app
-    class Cli < Thor
-      include Errors
-      include Table
-      include Utils
-
-      attr_reader :git
-
-      def initialize(*args)
-        super
-        @diff_list = nil
-        @git = GitHelper.new
-        @git.verbosity options[:verbose]
-        env_vars(options[:env] || [])
-      end
-
-      class_option :task_path,
-                   aliases: '-t',
-                   type: :string,
-                   desc: 'Directory where custom tasks are defined',
-                   default: './.singularity'
-      class_option :all_tasks,
-                   aliases: '-a',
-                   type: :boolean,
-                   desc: 'Do not stop on task failure(s), collect all results'
-      class_option :script,
-                   aliases: '-s',
-                   type: :string,
-                   desc: 'Specify path to a .singularityrc file',
-                   default: './.singularityrc'
-      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
-Runtime flags to set for use with flag_set?, formatted as VAR:VAL
-EOD
-
-      map %w(--version -v) => :__print_version
-      desc '--version, -v', 'print the version'
-      def __print_version
-        puts "Singularity Runner & DSL v#{SingularityDsl::VERSION}"
-      end
-
-      # TASKS COMMAND
-      desc 'tasks', 'Available tasks.'
-      def tasks
-        dsl = Dsl::Dsl.new
-        dsl.load_tasks_in_path tasks_path if ::File.exist? tasks_path
-        table = task_table
-        dsl.task_list.each do |task|
-          task_rows(dsl, task).each { |row| table.add_row row }
-        end
-        puts table
-      end
-
-      # TEST COMMAND
-      desc 'test', 'Run singularity script.'
-      def test(app = nil)
-        app ||= setup_app(Application.new,
-                          singularity_script,
-                          tasks_path,
-                          options[:flags] || [])
-        exit(app.run false, options[:all_tasks])
-      end
-
-      # BATCH COMMAND
-      desc 'batch BATCH_NAME',
-           'Run single task batch in the .singularityrc script.'
-      def batch(batch, app = nil)
-        app ||= setup_app(Application.new,
-                          singularity_script,
-                          tasks_path,
-                          options[:flags] || [])
-        exit(app.run batch, options[:all_tasks])
-      end
-
-      # TEST-MERGE COMMAND
-      desc 'testmerge FORK BRANCH INTO_BRANCH [INTO_FORK]',
-           'Perform a testmerge into the local repo and then run .singularityrc'
-      option :run_task,
-             aliases: '-r',
-             type: :string,
-             desc: 'Run a batch instead, after testmerge.',
-             default: ''
-      def testmerge(git_fork, branch, base_branch, base_fork = nil)
-        @git.merge_refs git_fork, branch, base_branch, base_fork
-        @diff_list = diff_list base_branch, base_fork
-        remove_remotes git_fork, base_fork
-        batch target_run_task if target_run_task
-        test unless target_run_task
-      end
-
-      private
-
-      def diff_list(ref, url)
-        @git.diff_remote ref, url, '--name-only'
-      end
-
-      def remove_remotes(*urls)
-        urls.each { |url| @git.remove_remote url }
-      end
-
-      def target_run_task
-        target = options[:run_task]
-        target = false if target.eql? ''
-        target
-      end
-
-      def singularity_script
-        File.expand_path options[:script]
-      end
-
-      def tasks_path
-        File.expand_path options[:task_path]
-      end
-    end
-  end
-end

data/lib/singularity_dsl/cli/table.rb

@@ -1,48 +0,0 @@
-# encoding: utf-8
-
-require 'rainbow'
-require 'terminal-table'
-
-module SingularityDsl
-  # CLI
-  module Cli
-    # util CLI table formatting fxs
-    module Table
-      private
-
-      def task_rows(dsl, task_class)
-        desc_lines = desc_rows task_class.new.description
-        name = dsl.task_name task_class
-        task_name = dsl.task task_class
-        rows = [[name, task_name, desc_lines.shift]]
-        desc_lines.each { |line| rows.push ['', '', line] }
-        rows
-      end
-
-      def desc_rows(desc)
-        desc_lines = []
-        line = ''
-        desc.split(' ').each do |word|
-          if (line + word).length > 80
-            desc_lines.push line.strip
-            line = ''
-          end
-          line += " #{word}"
-        end
-        desc_lines.push line.strip
-        desc_lines
-      end
-
-      def task_table
-        headers = [
-          Rainbow('Task').yellow,
-          Rainbow('Task Function').yellow,
-          Rainbow('Description').yellow
-        ]
-        table = Terminal::Table.new headings: headers
-        table.style = { border_x: '', border_y: '', border_i: '' }
-        table
-      end
-    end
-  end
-end

data/lib/singularity_dsl/cli/utils.rb

@@ -1,54 +0,0 @@
-# encoding: utf-8
-
-require 'singularity_dsl/stdout'
-
-module SingularityDsl
-  # CLI
-  module Cli
-    # util functions
-    module Utils
-      include Stdout
-
-      private
-
-      def env_vars(vals)
-        vals.each do |pair|
-          key = pair.split(':', 2).first
-          val = pair.split(':', 2).last
-          ENV[key] = val
-        end
-      end
-
-      def setup_app(app, singularity_script, tasks_path, flags = [])
-        inject_flags app, flags
-        inject_diff_list app
-        if ::File.exist? tasks_path
-          info "Loading tasks from #{tasks_path}"
-          app.load_tasks tasks_path
-        end
-        info "Loading CI script from #{singularity_script} ..."
-        app.load_script singularity_script
-        app
-      end
-
-      def inject_flags(app, flags = [])
-        flags.each do |pair|
-          key = pair.split(':', 2).first
-          val = pair.split(':', 2).last
-          app.runner.dsl.flag key if key == val
-          app.runner.dsl.flag key, val unless key == val
-        end
-        app
-      end
-
-      def inject_diff_list(app)
-        unless @diff_list.nil?
-          info 'Running with diff-list'
-          list_items @diff_list
-          app.change_list @diff_list
-        end
-        app
-      end
-    end
-  end
-end