right_chimp 2.1.10 → 2.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c13ca370025ded4b38f888ea6be7d9b6120c0f3
-  data.tar.gz: 5cf9d33faf1b2ac7770c45f594e170c8f95dad8b
+  metadata.gz: cc15b41e6fcc5ea1696d6255206015000f9a31ee
+  data.tar.gz: 462e82c8dc41dfb152fa2218be76f8dbe04b1c1c
 SHA512:
-  metadata.gz: 818b7ba69f19e685093bc6ce134e334f504d24177adb822d70e6bbc287506e93cc4969c1ea85da8800c62e9e4e376cc6f5b1f79edb41f7828abace034120181f
-  data.tar.gz: 4ff2cf25b23b3c8ef9196d89ffd6c1b8daef67d0e708e798e72da94bf3b79993d4b55037b8396ce16cb018d7971a2187a0064487e34f2b8f07181bf74b94f1be
+  metadata.gz: f0a8baa2ba2a7b35585d4d6c73a339d03d59cd21b7d02cb576f2f25f0f1fd502ee9d059f619b19d88628611563566de1fad78eddcdf02d274c19aab14df76d82
+  data.tar.gz: 7cc171141adc3b7c1204489c234e22e3e13ad6461591a47f68910ff31c5e87cbaa32c7d12b28d5e7cc7fbd669ed953a7fde5aedfd5d892ff73154d6a7520b70c

data/.gitignore

@@ -1 +1,2 @@
 pkg/*
+.bundle/*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    right_chimp (2.1.10)
+    right_chimp (2.1.12)
       highline (~> 1.7.2)
       nokogiri (~> 1.6.7.1)
       progressbar (~> 0.11.0)
@@ -11,19 +11,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
+    coderay (1.1.0)
+    debug_inspector (0.0.2)
     diff-lcs (1.1.3)
-    domain_name (0.5.25)
+    domain_name (0.5.20160128)
       unf (>= 0.0.5, < 1.0.0)
     highline (1.7.8)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     json (1.8.3)
+    method_source (0.8.2)
     mime-types (1.25.1)
     mini_portile2 (2.0.0)
     netrc (0.11.0)
-    nokogiri (1.6.7.1)
+    nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     progressbar (0.11.0)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-stack_explorer (0.4.9.2)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
     rake (10.4.2)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -41,14 +53,17 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    slop (3.6.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.1)
+    unf_ext (0.0.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  pry
+  pry-stack_explorer
   right_chimp!
   rspec (~> 2.6.0)
 

data/chimp.gemspec

@@ -27,4 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency "highline", "~> 1.7.2"
 
   s.add_development_dependency "rspec", "~> 2.6.0"
+  s.add_development_dependency "pry"
+  s.add_development_dependency "pry-stack_explorer"
+
 end

data/lib/right_chimp/Chimp.rb

@@ -223,7 +223,7 @@ module Chimp
           }
         }
 
-	Log.debug "[#{Chimp.get_job_uuid}] Found #{@servers.count} servers for that array query"
+        Log.debug "[#{Chimp.get_job_uuid}] Found #{@servers.count} servers for that array query"
 
       end
       # The result will be stored (not returned) into @servers
@@ -332,7 +332,8 @@ module Chimp
           [ '--group-concurrency', '-3', GetoptLong::REQUIRED_ARGUMENT ],
           [ '--timing-log', '-4', GetoptLong::REQUIRED_ARGUMENT ],
           [ '--timeout', '-5',  GetoptLong::REQUIRED_ARGUMENT ],
-          [ '--noverify', '-6', GetoptLong::NO_ARGUMENT ]
+          [ '--noverify', '-6', GetoptLong::NO_ARGUMENT ],
+          [ '--exact-matching', '-8', GetoptLong::NO_ARGUMENT ]
         )
 
         opts.each do |opt, arg|
@@ -433,6 +434,8 @@ module Chimp
               @timeout = arg
             when '--noverify'
               @verify = false
+            when '--exact-matching'
+              @exact = true
           end
         end
 
@@ -556,7 +559,11 @@ module Chimp
       servers = []
       all_instances = Connection.all_instances
 
-      result = all_instances.select {|i| names.any? {|n| i['links']['deployment']['name'] =~ /#{n}/ }}
+      if @exact
+        result = all_instances.select {|i| names.any? {|n| i['links']['deployment']['name'].eql? n }}
+      else
+        result = all_instances.select {|i| names.any? {|n| i['links']['deployment']['name'] =~ /#{n}/ }}
+      end
       servers = result
 
       return(servers)
@@ -577,7 +584,16 @@ module Chimp
           result = Connection.client.server_arrays.index(:filter => ["name==#{array_name}"])
           # Result is an array with all the server arrays
           if result.size != 0
-            arrays_hrefs += result.collect(&:href)
+            if @exact
+              #remove results that do not exactly match
+              result.each{ |r|
+                if array_names.include?(r.raw['name'])
+                  arrays_hrefs += [ r.href ]
+                end
+              }
+            else
+              arrays_hrefs += result.collect(&:href)
+            end
           else
             if @ignore_errors
               Log.debug "[#{Chimp.get_job_uuid}] Could not find array \"#{array_name}\""

data/lib/right_chimp/daemon/ChimpDaemon.rb

@@ -199,6 +199,7 @@ module Chimp
     def install_signal_handlers
       ['INT', 'TERM'].each do |signal|
         trap(signal) do
+          puts "Terminating..."
           self.quit
         end
       end
@@ -587,6 +588,34 @@ module Chimp
           raise WEBrick::HTTPStatus::OK
         end
 
+        #
+        # Attempt to return just 1 job data
+        #
+        if req.request_uri.path =~ /jobs\.json\/id\/*\w{6}$/
+
+          job_uid = File.basename(req.request_uri.path)
+          #instance the queue
+          queue = ChimpQueue.instance
+
+          my_hash =  {}
+
+          #! Multiple servers WILL match for the same job_uuid
+          queue.group.each { |group|
+            #per each group, locate all jobs
+            group[1].get_jobs.each {|job|
+              my_hash[job.job_uuid] = { job.job_id => { "state" => job.results,
+                                                        "server" => job.server.params["name"],
+                                                        "audit_entry" => job.audit_entry_data,
+                                        }
+                                      }
+            }
+          }
+
+          resp.body = my_hash[job_uid].to_json
+
+          raise WEBrick::HTTPStatus::OK
+        end
+
 
         #
         # Check for static CSS files and serve them

data/lib/right_chimp/exec/ExecRightScript.rb

@@ -3,34 +3,37 @@
 #
 module Chimp
   class ExecRightScript < Executor
-  
+
+    attr_accessor :audit_entry_data
+
     def run
       options = {:ignore_lock => true}.merge(@inputs)
-      
+
       if @timeout < 300
         Log.error "timeout was less than 5 minutes! resetting to 5 minutes"
         @timeout = 300
       end
-    
+
       run_with_retry do
         task=Task.new
         task.tasker = @server.run_executable(@exec, options)
         task.wait_for_state("completed", @timeout)
-        @results = task.tasker.show.summary
+        @results = task.state
+        @audit_entry_data = task.details
       end
     end
-    
+
     def describe_work
       return "[#{@job_uuid}] ExecRightScript job_id=#{@job_id} script=\"#{@exec.params['right_script']['name']}\" server=\"#{@server.nickname}\""
     end
-    
+
     def info
       return @exec.params['right_script']['name']
     end
-    
+
     def target
       return @server.nickname
     end
-    
+
   end
 end

data/lib/right_chimp/exec/Executor.rb

@@ -7,9 +7,9 @@ module Chimp
     attr_accessor :server, :array, :exec, :inputs, :template, :owner, :group,
                   :job_id, :job_uuid, :status, :dry_run, :verbose, :quiet, :timeout,
                   :retry_count, :retry_sleep, :time_start, :time_end, :error
-    
+
     attr_reader   :results
-    
+
     STATUS_NONE =     :none
     STATUS_HOLDING =  :holding
     STATUS_RUNNING =  :running
@@ -29,20 +29,19 @@ module Chimp
       @inputs = h[:inputs]            || nil
 
       @verbose = h[:verbose]          || false
-      
+
       @retry_count = h[:retry_count].to_i || 0
       @retry_sleep = h[:retry_sleep].to_i || 30
       @timeout = h[:timeout].to_i         || 3600
-      
+
       @error = nil
       @status = STATUS_NONE
       @owner = nil
       @dry_run = false
       @quiet = false
-      
+
       @time_start = nil
       @time_end = nil
-      @results = nil
     end
 
     #
@@ -57,21 +56,21 @@ module Chimp
         return @time_end.to_i- @time_start.to_i
       end
     end
-    
+
     #
     # Convenience method to queue a held job
     #
     def queue
       @group.queue(self.job_id)
     end
-    
+
     #
     # Convenience method to requeue
     #
     def requeue
       @group.requeue(self.job_id)
     end
-    
+
     #
     # Convenience method to cancel
     #
@@ -82,21 +81,21 @@ module Chimp
     def run
       raise "run method must be overridden"
     end
-      
+
     #
     # return info on what this executor does -- eg name of script or command
     #
     def info
       raise "unimplemented"
     end
-    
+
     def target
       return "UNKNOWN"
     end
 
-        
+
     protected
-    
+
     #
     # Run a unit of work with retries
     # This is called from the subclass with a code block to yield to
@@ -108,36 +107,36 @@ module Chimp
       @time_start = Time.now
 
       Log.info self.describe_work_start unless @quiet
-      
+
       #
       # The inner level of exception handling here tries to catch anything
       # that can be easily retired or failed-- normal exceptions.
       #
       # The outer level of exception handling handles weird stuff; for example,
-      # sometimes rest_connection raises RuntimeError exceptions... 
+      # sometimes rest_connection raises RuntimeError exceptions...
       #
       # This fixes acu75562.
       #
       begin
         begin
           yield if not @dry_run
-        
+
           if @owner != nil
             @status = STATUS_DONE
             @group.job_completed
           else
             Log.warn "[#{@job_uuid}] Ownership of job_id #{job_id} lost. User cancelled operation?"
           end
-        
+
         rescue SystemExit, Interrupt => ex
           $stderr.puts "Exiting!"
           raise ex
-        
+
         rescue Interrupt => ex
           name = @array['name'] if @array
           name = @server['name'] || @server['nickname'] if @server
           Log.error self.describe_work_error
-        
+
           if @retry_count > 0
             @status = STATUS_RETRYING
             Log.error "[#{@job_uuid}] Error executing on \"#{name}\". Retrying in #{@retry_sleep} seconds..."
@@ -145,16 +144,16 @@ module Chimp
             sleep @retry_sleep
             retry
           end
-        
+
           @status = STATUS_ERROR
           @error = ex
           Log.error "[#{@job_uuid}] Error executing on \"#{name}\": #{ex}"
-          
-        ensure 
+
+        ensure
           @time_end = Time.now
           Log.info self.describe_work_done unless @quiet
         end
-        
+
       rescue RuntimeError => ex
         Log.error "[#{@job_uuid}] Caught RuntimeError: #{ex}. Aborting job."
         Log.error ex.inspect
@@ -163,7 +162,7 @@ module Chimp
         @error = ex
       end
     end
-    
+
     #
     # This method should be overridden on Executor subclasses
     # to provide a human readable description of the work
@@ -172,7 +171,7 @@ module Chimp
     def describe_work
       return "#{self.class.name} job_id=#{@job_id}"
     end
-    
+
     def describe_work_start
       return("#{self.describe_work} status=START")
     end
@@ -180,13 +179,13 @@ module Chimp
     def describe_work_done
       return("#{self.describe_work} status=END time=#{@time_end.to_i-@time_start.to_i}s")
     end
-    
+
     def describe_work_done_long
       return("#{self.describe_work} status=END time_start=#{@time_start.to_i} time_end=#{@time_end.to_i} time_total=#{@time_end.to_i-@time_start.to_i}")
     end
-    
+
     def describe_work_error
       return("#{self.describe_work} status=ERROR")
-    end    
+    end
   end
 end

data/lib/right_chimp/objects/ChimpObjects.rb

@@ -45,6 +45,8 @@ module Chimp
         # Figure out url to hit:
         creds[:api_url] = "https://"+URI.parse(creds[:api_url]).host
 
+        @audit_url = creds[:api_url] + "/acct/" + creds[:account]
+
         @endpoint = URI.parse(creds[:api_url]).host
 
         Log.debug "Logging into Api 1.5 right_api_client"
@@ -71,6 +73,10 @@ module Chimp
       @endpoint
     end
 
+    def self.audit_url
+      @audit_url
+    end
+
     #
     # Returns every single operational instance in the account
     #
@@ -283,10 +289,9 @@ module Chimp
       while(timeout > 0)
         state=self.tasker.show.summary
       return true if self.state.match(desired_state)
-        friendly_url = "https://"+Connection.endpoint+"/audit_entries/"
+        friendly_url = Connection.audit_url+"/audit_entries/"
         friendly_url += self.href.split(/\//).last
         friendly_url = friendly_url.gsub("ae-","")
-        # raise "FATAL error, #{self.tasker.show.summary}\n See Audit: API:#{self.href}, WWW:<a href='#{friendly_url}'>#{friendly_url}</a>\n " if self.state.match("failed")
         raise "FATAL error, #{self.tasker.show.summary}\n See Audit: #{friendly_url}'\n " if self.state.match("failed")
         sleep 30
         timeout -= 30
@@ -305,6 +310,10 @@ module Chimp
     def href
       self.tasker.href
     end
+
+    def details
+      self.tasker.show(:view => "extended").detail
+    end
   end
 
   #

data/lib/right_chimp/templates/all_jobs.erb

@@ -1,7 +1,6 @@
 <html><head>
 <title>chimpd</title>
 <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-<meta http-equiv="refresh" content="5">
 <link rel="stylesheet" href="default.css" title="default" />
 <link rel="alternate stylesheet" href="greenscreen.css" title="greenscreen" />
 <link rel="alternate stylesheet" href="hotdogstand.css" title="hotdogstand" />
@@ -19,16 +18,30 @@
     xmlhttp.send();
   }
 
+  var myRefreshTimeout;
+
+  /** Function to refresh the page at specified interval. **/
+  function startRefresh(refreshPeriod) {
+      myRefreshTimeout = setTimeout("window.location.reload();",refreshPeriod);
+  }
+
+  /** Function to stop refreshing the page. **/
+  function stopRefresh() {
+      clearTimeout(myRefreshTimeout);
+      window.location.hash = 'stop'
+  }
+
 </script>
 
-</head><body>
+</head>
+<body onload="startRefresh(5000);">
+
 
 <div id="stats">
 
 <h1>chimpd <%=VERSION%> console</h1>
 <p style="font-size: 90%; padding-left: 10px">FEATURING CUTTING EDGE META REFRESH<br/> TECHNOLOGY
 SINCE 2012</p>
-
 <h3>Queue Status</h3>
 
 <table>
@@ -93,6 +106,15 @@ SINCE 2012</p>
   <li> <a href="#" onclick="setActiveStyleSheet('invertedhotdogstand')">inverted hot dog stand</a></li>
 </ol>
 
+<h3>Auto Refresh</h3>
+<ol>
+  <div class="btn-group">
+      <a class="btn btn-success" onclick="startRefresh()" id="start">Enable</a>
+      <a class="btn btn-danger" onclick="stopRefresh()" id="stop">Disable</a>
+      <p id="console"></p>
+  </div>
+</ol>
+
 </div>
 
 <div id="jobs">
@@ -152,6 +174,9 @@ jobs.each do |j|
     <li>Time: <%= time %></li>
     <% if status != Executor::STATUS_RUNNING %>
       <li>Results: <span style="color:#777"><%= j.results %></span></li>
+      <!-- HACK HERE THE LOOP CODE TO INJECT CSS TO HIDE/EXPAND-->
+      <li><label for="<%= id%>">Details (click to expand):</label> <input type="checkbox" id="<%= id%>"><span style="color:#777"><div id="d<%= id%>" class="job_details"><%= j.audit_entry_data %></div></span></li>
+      <!-- HACK HERE THE LOOP CODE TO INJECT CSS TO HIDE/EXPAND-->
     <% end %>
 
     <li> <span class="action">

data/lib/right_chimp/templates/default.css

@@ -79,3 +79,28 @@ a {
 a:hover, ol a:hover {
   text-decoration: underline;
 }
+
+
+/* Checkbox Hack */
+li {
+  list-style-type: none;
+}
+input[type=checkbox] {
+   position: absolute;
+   top: -9999px;
+   left: -9999px;
+}
+label {
+  display: inline-block;
+  cursor: pointer;
+}
+
+/* Default State */
+span div.job_details {
+  display: none;
+}
+
+/* Toggled State */
+input[type=checkbox]:checked ~ span div.job_details {
+ display: block;
+}

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "2.1.10"
+  VERSION = "2.1.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 2.1.10
+  version: 2.1.12
 platform: ruby
 authors:
 - RightScale Operations
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-stack_explorer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The Chimp is a tool for managing servers using the RightScale platform.
 email:
 - ops@rightscale.com
@@ -166,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: RightScale platform command-line tool