lita-bamboo 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f251f089a022a0bda5e84085ab6cb8a553dd0b24
-  data.tar.gz: a0b9a024d30b1ebd63fcd53548b946763750e5c0
+  metadata.gz: 7900de87469633c5def0649c70e87a293b2445d4
+  data.tar.gz: 2acfdefa928a86e3326a49677bbb2e1d0b31ec2d
 SHA512:
-  metadata.gz: a2d549149f4f4d9e30352297b1fc77c2f0ca8f84858cdb88af5087464da81452921a251e24996949bdd4d3dded6782ccb19f7b8b15ca64dcb1af264c39610cd6
-  data.tar.gz: 3919b81f37e2d024b3f3f1736818476b55f5cb5a69d5826704b4f444dd291f068429f843478658cfec5fbd9a445b37d6a02082d362b0391805b4057f2ff52e0c
+  metadata.gz: 70b21815adf6b3f4405b3d87e66336f9fd23841cce4144a1411021e2e5f543e2df19ea587003e14a1152051abf5a203884e8e1b9f25afa5c18ca2d216072b684
+  data.tar.gz: f12dd05405940010d1057375d0b7855ee230a9569e53e263da0509d30d5d51b7d7286dabc16060276c1695481080aa4de14edace946beb30ec3373b4599c8e70

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+# lita-bamboo Change Log
+
+### v0.1.2
+* list build queue
+* queue plan for build
+* dequeue plan from build queue
+
+### v0.1.1
+* output changes for list plan and projects
+
+### v0.1.0
+* list projects
+* list plans
+* list plan build results

data/README.md

@@ -23,3 +23,6 @@ end
 * bamboo list projects
 * bamboo list project PROJECT_KEY plans
 * bamboo list plan PLAN_KEY results limit 2
+* bamboo list queue
+* bamboo queue PLAN_KEY
+* bamboo dequeue BUILD_KEY

data/lib/bamboohelper/plans.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'rest-client'
 module LitaBambooHelper
   module Plan
     def list_projects
@@ -64,32 +65,46 @@ module LitaBambooHelper
     end
 
     def queue_plan(plan_id)
-      url = "#{config.url}/queue/#{plan_id}"
+      url = "#{config.url}/queue/#{plan_id}?os_authType=basic"
       begin
-        response = RestClient::Request.execute(:url => url, :verify_ssl => config.verify_ssl, :method=> :post)
+        response = RestClient::Request.execute(:url => url, :verify_ssl => config.verify_ssl, :method=> :post, user: config.user, password: config.password)
         if response.code == 200
           true
         else
           false
         end
       rescue Exception=>e
-        raise "Error to queue paln for build :#{e.message}"
+        raise "Error to queue plan #{plan_id} for build :#{e.message}"
+      end
+    end
+
+    def dequeue_plan(build_id)
+      url = "#{config.url}/queue/#{build_id}?os_authType=basic"
+      begin
+        response = RestClient::Request.execute(:url => url, :verify_ssl => config.verify_ssl, :method=> :delete, user: config.user, password: config.password)
+        if response.code == 200
+          true
+        else
+          false
+        end
+      rescue Exception=>e
+        raise "Error to dequeue plan build #{build_id} :#{e.message}"
       end
     end
 
     def list_queue()
-      url = "#{config.url}/queue?os_authType=basic"
+      url = "#{config.url}/queue.json?os_authType=basic"
       info = []
       begin
-        response = RestClient::Request.execute(:url => url, :verify_ssl => config.verify_ssl, :method=> :get)
+        response = RestClient::Request.execute(:url => url, :verify_ssl => config.verify_ssl, :method=> :get, user: config.user, password: config.password)
         json_response = JSON.parse(response)
-        if json_response['results']['result']
-          json_response['results']['result'].each do |result|
-            info << "[#{result['buildResultKey']}] : Successful=#{result['successful']} Finished=#{result['finished']} NotRunYet=#{result['notRunYet']} Start: #{result['prettyBuildStartedTime']} Complete: #{result['prettyBuildCompletedTime']}"
+        if json_response['queuedBuilds']['queuedBuild']
+          json_response['queuedBuilds']['queuedBuild'].each do |result|
+            info << "BuildKey: #{result['buildResultKey']} TrigerReason: #{result['triggerReason']} "
           end
         end
       rescue Exception=>e
-        raise "Error to list build results :#{e.message}"
+        raise "Error to list build queue :#{e.message}"
       end
       info
     end

data/lib/lita-bamboo.rb

@@ -4,7 +4,6 @@ Lita.load_locales Dir[File.expand_path(
   File.join("..", "..", "locales", "*.yml"), __FILE__
 )]
 
-require "bamboohelper/misc"
 require "bamboohelper/plans"
 require "lita/handlers/bamboo"
 require "lita"

data/lib/lita/handlers/bamboo.rb

@@ -5,8 +5,9 @@ module Lita
       namespace 'Bamboo'
       config :url, required: true, type: String  # https://host:port/rest/api/latest
       config :verify_ssl, required: true, types: [TrueClass, FalseClass], default: false
+      config :user, required: true, type: String
+      config :password, required: true, type: String
 
-      include ::LitaBambooHelper::Misc
       include ::LitaBambooHelper::Plan
 
       route(
@@ -36,6 +37,33 @@ module Lita
         }
       )
 
+      route(
+        /^bamboo\s+list\s+queue\s*$/,
+        :cmd_list_queue,
+        command: true,
+        help: {
+          t('help.cmd_list_queue_key') => t('help.cmd_list_queue_value')
+        }
+      )
+
+      route(
+        /^bamboo\s+queue\s+(\S+)$/,
+        :cmd_queue_plan,
+        command: true,
+        help: {
+          t('help.cmd_queue_plan_key') => t('help.cmd_queue_plan_value')
+        }
+      )
+
+      route(
+        /^bamboo\s+dequeue\s+(\S+)$/,
+        :cmd_dequeue_plan,
+        command: true,
+        help: {
+          t('help.cmd_dequeue_plan_key') => t('help.cmd_dequeue_plan_value')
+        }
+      )
+
       def cmd_list_projects(response)
         begin
           info = list_projects
@@ -66,6 +94,39 @@ module Lita
         end
       end
 
+      def cmd_queue_plan(response)
+        plan_id = response.matches[0][0]
+        begin
+          success = queue_plan(plan_id)
+          unless success
+            response.reply "Failed to queue plan #{plan_id}"
+          end
+        rescue Exception => e
+          response.reply e.message
+        end
+      end
+
+      def cmd_dequeue_plan(response)
+        build_id = response.matches[0][0]
+        begin
+          success = dequeue_plan(build_id)
+          unless success
+            response.reply "Failed to dequeue plan build #{build_id}"
+          end
+        rescue Exception => e
+          response.reply e.message
+        end
+      end
+
+      def cmd_list_queue(response)
+        begin
+          info = list_queue
+          response.reply info
+        rescue Exception => e
+          response.reply e.message
+        end
+      end
+
       Lita.register_handler(self)
 
     end

data/lita-bamboo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-bamboo"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["Wang, Dawei"]
   spec.email         = ["dwang@entertainment.com"]
   spec.description   = "Bamboo Lita tasks"

data/locales/en.yml

@@ -9,3 +9,9 @@ en:
           cmd_list_project_plans_value: 'List all plans in project'
           cmd_list_plan_results_key: 'bamboo list plan LAN_KEY results limit LIMIT'
           cmd_list_plan_results_value: 'List plan build results last LIMIT'
+          cmd_list_queue_key: 'bamboo list queue'
+          cmd_list_queue_value: 'List what is in current build queue'
+          cmd_queue_plan_key: 'bamboo queue PLAN_KEY'
+          cmd_queue_plan_value: 'Queue plan for build'
+          cmd_dequeue_plan_key: 'bamboo dequeue BUILD_KEY'
+          cmd_dequeue_plan_value: 'Dequeue plan from build'

data/spec/lita/handlers/bamboo_spec.rb

@@ -4,11 +4,16 @@ describe Lita::Handlers::Bamboo, lita_handler: true do
   before do
     registry.config.handlers.bamboo.url = 'https://bamboo.entertainment.com/rest/api/latest'
     registry.config.handlers.bamboo.verify_ssl = false
+    registry.config.handlers.bamboo.user = 'dummy'
+    registry.config.handlers.bamboo.password = 'pass'
   end
   it do
     is_expected.to route_command('bamboo list project').to(:cmd_list_projects)
     is_expected.to route_command('bamboo list project AG plans').to(:cmd_list_project_plans)
     is_expected.to route_command('bamboo list plan AG-FPMWIL results limit 1').to(:cmd_list_plan_results)
+    is_expected.to route_command('bamboo list queue').to(:cmd_list_queue)
+    is_expected.to route_command('bamboo queue PM-RVMGEMSET').to(:cmd_queue_plan)
+    is_expected.to route_command('bamboo dequeue PM-RVMGEMSET-8').to(:cmd_dequeue_plan)
   end
 
   describe '#get all project list' do
@@ -46,4 +51,25 @@ describe Lita::Handlers::Bamboo, lita_handler: true do
       #expect(replies.last).to match(/repositoryPath/)
     end
   end
+
+  describe '#get build queue' do
+    it 'list build queue' do
+      send_command('bamboo list queue')
+      puts replies.last
+    end
+  end
+
+  describe '#queue plan for build' do
+    it 'queue plan' do
+      send_command('bamboo queue PM-RVMGEMSET')
+      puts replies.last
+    end
+  end
+
+  describe '#dequeue plan from build' do
+    it 'dequeue plan' do
+      send_command('bamboo dequeue PORJ-PLAN-8')
+      puts replies.last
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-bamboo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Wang, Dawei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -109,10 +109,10 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
-- lib/bamboohelper/misc.rb
 - lib/bamboohelper/plans.rb
 - lib/lita-bamboo.rb
 - lib/lita/handlers/bamboo.rb

data/lib/bamboohelper/misc.rb

@@ -1,8 +0,0 @@
-require 'rest-client'
-module LitaBambooHelper
-  module Misc
-    def get_request
-
-    end
-  end #module misc
-end#module