dtk-client 0.7.5 → 0.7.6

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-client
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,7 @@ files:
 - lib/client.rb
 - lib/command_helper.rb
 - lib/command_helpers/git_repo.rb
+- lib/command_helpers/git_repo/merge.rb
 - lib/command_helpers/jenkins_client.rb
 - lib/command_helpers/jenkins_client/config_xml.rb
 - lib/command_helpers/service_importer.rb
@@ -234,16 +235,6 @@ files:
 - lib/commands/common/thor/remotes.rb
 - lib/commands/common/thor/reparse.rb
 - lib/commands/common/thor/set_required_attributes.rb
-- lib/commands/common/thor/task_status.rb
-- lib/commands/common/thor/task_status/refresh_mode.rb
-- lib/commands/common/thor/task_status/snapshot_mode.rb
-- lib/commands/common/thor/task_status/stream_mode.rb
-- lib/commands/common/thor/task_status/stream_mode/element.rb
-- lib/commands/common/thor/task_status/stream_mode/element/no_results.rb
-- lib/commands/common/thor/task_status/stream_mode/element/render.rb
-- lib/commands/common/thor/task_status/stream_mode/element/stage.rb
-- lib/commands/common/thor/task_status/stream_mode/element/task_end.rb
-- lib/commands/common/thor/task_status/stream_mode/element/task_start.rb
 - lib/commands/thor/account.rb
 - lib/commands/thor/assembly.rb
 - lib/commands/thor/attribute.rb
@@ -321,6 +312,27 @@ files:
 - lib/shell/message_queue.rb
 - lib/shell/parse_monkey_patch.rb
 - lib/shell/status_monitor.rb
+- lib/task_status.rb
+- lib/task_status/refresh_mode.rb
+- lib/task_status/snapshot_mode.rb
+- lib/task_status/stream_mode.rb
+- lib/task_status/stream_mode/element.rb
+- lib/task_status/stream_mode/element/format.rb
+- lib/task_status/stream_mode/element/hierarchical_task.rb
+- lib/task_status/stream_mode/element/hierarchical_task/result.rb
+- lib/task_status/stream_mode/element/hierarchical_task/result/action.rb
+- lib/task_status/stream_mode/element/hierarchical_task/result/components.rb
+- lib/task_status/stream_mode/element/hierarchical_task/result/node_level.rb
+- lib/task_status/stream_mode/element/hierarchical_task/steps.rb
+- lib/task_status/stream_mode/element/hierarchical_task/steps/action.rb
+- lib/task_status/stream_mode/element/hierarchical_task/steps/components.rb
+- lib/task_status/stream_mode/element/hierarchical_task/steps/node_level.rb
+- lib/task_status/stream_mode/element/no_results.rb
+- lib/task_status/stream_mode/element/render.rb
+- lib/task_status/stream_mode/element/stage.rb
+- lib/task_status/stream_mode/element/stage/render.rb
+- lib/task_status/stream_mode/element/task_end.rb
+- lib/task_status/stream_mode/element/task_start.rb
 - lib/util/common_util.rb
 - lib/util/console.rb
 - lib/util/dtk_puppet.rb

data/lib/commands/common/thor/task_status/stream_mode/element/render.rb

@@ -1,88 +0,0 @@
-module DTK::Client; class TaskStatus::StreamMode
-  class Element
-    module RenderMixin
-    end
-  end
-end; end
-
-=begin
-      def task_status_old()
-        current_index = 1
-        last_printed_index = 0
-        success_indices = []
-        loop do
-          response = post_call(:form => :stream_form)
-          return response unless response.ok?
-          
-          current_tasks = response.data.select { |el| el['index'] == current_index }
-          main_task     = current_tasks.find { |el| el['sub_index'].nil? }
-          
-          # this means this is last tasks
-          unless main_task
-            print_succeeded_tasks(response.data, success_indices)
-            return Response::Ok.new()
-          end
-          
-          case main_task['status']
-          when 'executing'
-            if (last_printed_index != current_index)
-              OsUtil.clear_screen
-              print_succeeded_tasks(response.data, success_indices)
-              print_tasks(current_tasks)
-              last_printed_index = current_index
-            end
-          when 'succeeded'
-            success_indices << current_index
-            current_index  += 1
-          when nil
-            # ignore
-          else
-            errors = current_tasks.collect { |ct| ct['errors'] }.compact
-            error_msg = errors.collect { |err| err['message'] }.uniq.join(', ')
-            raise DtkError, "We've run into an error on task '#{main_task['type']}' status '#{main_task['status']}', error: #{error_msg}"
-          end
-          
-          sleep(5)
-        end
-      end
-      
-     private
-      def print_tasks(tasks)
-        hirb_options = { 
-          :headers => nil, 
-          :filters => [Proc.new { |a| append_to(25, a) }, 
-                       Proc.new { |a| append_to(15, a)}, 
-                       Proc.new { |a| append_to(15, a)}, 
-                       Proc.new { |a| append_to(8, a)}], 
-          :unicode => true, 
-          :description => false 
-        }
-
-        tasks.each do |task|
-          node_name = task['node'] ? task['node']['name'] : ''
-          
-          puts Hirb::Helpers::AutoTable.render([[task['type'], task['status'], node_name, task['duration'], parse_date(task['started_at']), parse_date(task['ended_at'])]], hirb_options)
-        end
-      end
-
-      def print_succeeded_tasks(tasks, success_indices)
-        succeeded_tasks = tasks.select { |task| success_indices.include?(task['index']) }
-        print_tasks(succeeded_tasks)
-      end
-
-      def parse_date(string_date)
-        string_date.nil? ? (' ' * 17) : DateTime.parse(string_date).strftime('%H:%M:%S %d/%m/%y')
-      end
-
-      def append_to(number_of_chars, value)
-        value ||= ''
-        value.strip!
-        appending_str = ' ' * (number_of_chars - value.size)
-        value.insert(0, appending_str)
-      end
-    end
-  end
-end
-
-=end
-

data/lib/commands/common/thor/task_status/stream_mode/element/stage.rb

@@ -1,13 +0,0 @@
-module DTK::Client; class TaskStatus::StreamMode
-  class Element
-    class Stage < self
-      def self.get(task_status_handle,stage_num)
-        get_stages(task_status_handle,stage_num,stage_num)
-      end
-
-      def self.get_stages(task_status_handle,start_stage_num,end_stage_num)
-        get_task_status_elements(task_status_handle,:stage,:start_index => start_stage_num, :end_index => end_stage_num)
-      end
-    end
-  end
-end; end

data/lib/commands/common/thor/task_status/stream_mode/element/task_end.rb

@@ -1,10 +0,0 @@
-module DTK::Client; class TaskStatus::StreamMode
-  class Element
-    class TaskEnd < self
-      def task_end?()
-        true
-      end
-    end
-  end
-end; end
-

data/lib/commands/common/thor/task_status/stream_mode/element/task_start.rb

@@ -1,10 +0,0 @@
-module DTK::Client; class TaskStatus::StreamMode
-  class Element
-    class TaskStart < self
-      def self.get(task_status_handle)
-        get_task_status_elements(task_status_handle,:task_start,:start_index => 0, :end_index => 0)
-      end
-    end
-  end
-end; end
-

data/lib/commands/common/thor/task_status/stream_mode/element.rb

@@ -1,90 +0,0 @@
-module DTK::Client; class TaskStatus::StreamMode
-  class Element
-    require File.expand_path('element/task_start',File.dirname(__FILE__))
-    require File.expand_path('element/task_end',File.dirname(__FILE__))
-    require File.expand_path('element/stage',File.dirname(__FILE__))
-    require File.expand_path('element/no_results',File.dirname(__FILE__))
-    require File.expand_path('element/render',File.dirname(__FILE__))
-    include RenderMixin
-    
-    def initialize(response_element)
-      @response_element = response_element
-    end
-
-    def self.get_and_render_task_start(task_status_handle)
-      render_elements(TaskStart.get(task_status_handle))
-    end
-    
-    # opts has
-    #   :wait - amount to wait if get no results (required)
-    def self.get_and_render_stages(task_status_handle,opts={})
-      unless wait = opts[:wait]
-        raise DtkError::Client, "opts[:wait] must be set"
-      end
-
-      stage = 1
-      task_end = false
-      until task_end do
-        elements = Stage.get(task_status_handle,stage)
-        if no_results_yet?(elements)
-          sleep wait
-          next
-        end
-        
-        render_elements(elements)
-        
-        if task_end?(elements)
-          task_end = true
-        else
-          stage += 1
-        end
-      end
-    end
-    
-    def render()
-      #TODO: stub
-      #TODO: make this nil and overwride all elements types to render
-      pp [:element,self.class,self]
-    end
-    
-    private
-    # opts will have
-    #   :start_index
-    #   :end_index
-    def self.get_task_status_elements(task_status_handle,element_type,opts={})
-      response =  task_status_handle.post_call(opts.merge(:form => :stream_form))
-      create_elements(response)
-    end
-
-    def self.create_elements(response)
-      response_elements = response.data
-      unless response_elements.kind_of?(Array)
-        raise DtkError::Client.new("Unexpected that response.data no at array")
-      end
-      response_elements.map{|el|create(el)}
-    end
-    def self.create(response_element)
-      type = response_element['type'] 
-      case type && type.to_sym
-        when :task_start then TaskStart.new(response_element)
-        when :task_end   then TaskEnd.new(response_element)
-        when :stage      then Stage.new(response_element)
-        when :no_results then NoResults.new(response_element)
-        else raise DtkError::Client.new("Unexpected element type '#{type}'")
-      end
-    end
-    
-    def self.task_end?(elements)
-      elements.empty? or elements.last.kind_of?(TaskEnd)
-    end
-    
-    def self.no_results_yet?(elements)
-      elements.find{|el|el.kind_of?(NoResults)}
-    end
-      
-    def self.render_elements(elements)
-      elements.each{|el|el.render()}
-    end
-    
-  end
-end; end