lita-rally 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb69ad300e75b3048aa6b0941b3aed94f6fe3884
-  data.tar.gz: 31e6aeafcdccea484d825760b80658a145d98c98
+  metadata.gz: f789be04a2bffa5e4e6273765edc7d967702721d
+  data.tar.gz: 67351f852ce4c271cd9d99694df3f06994ef39a5
 SHA512:
-  metadata.gz: 98e8d665d81080f77633297dbd31ae92d2e7d23c27b0a6e352891a952d614587b53eaf0017a9e9138d45353916b5ff38c18b098beddc5055692973bf99391126
-  data.tar.gz: b9beadf1b2cef34b315a50dadefffc966f773223f9e7dbb78117cfc9e937a2d3421dd80119fda77b0b4b019909f1651d18b6e891cf0471161851632f0f7754e4
+  metadata.gz: 5164b6d3de89f8e4640a6465b83d272b3922f53c31c7b58c9f4dcc1976e04ababcfb9e43ead1fb0e03d14225b24e399ecb6df34dc49b1fe87e852460b2c02df1
+  data.tar.gz: 7ce2deeedc11df2a31d816bd33acbeecfaf77b8551d8d2ab5f254e88c1c374302979901b9cfe843ed9c07e09c158f246e2d3cb59f15354638a2c8fb19dd50533

data/lib/lita/handlers/rally.rb

@@ -1,9 +1,13 @@
 require 'rest-client'
 require 'json'
+require 'rally_api'
 
 module Lita
   module Handlers
     class Rally < Handler
+
+      RALLY = "https://rally1.rallydev.com/slm/webservice"
+
       @@key_map = {
         'de' => {
           name: 'defect',
@@ -71,9 +75,9 @@ module Lita
         }
       }
 
-      config :username
-      config :password
-      config :api_version
+      config :username, type: String, required: true
+      config :password, type: String, required: true
+      config :api_version, type: String, default: 'v2.0'
 
       route(/^rally me ([[:alpha:]]+)(\d+)/, :rally_show, command: true, help: {
         'rally me <identifier>' => 'Show me that rally object'
@@ -90,153 +94,122 @@ module Lita
       })
 
       def rally_show(response)
-        if config_validate
-          get_rally_object(response)
-        else
-          response.reply('Configuration failed to validate, '\
-                         'check your config')
-        end
+        type = response.matches[0][0].downcase
+        id = response.matches[0][1]
+
+        response.reply(get_rally_object(type, id))
       end
 
       def rally_release_stats(response)
-        if config_validate
-          get_rally_release_stat(response)
-        else
-          response.reply('Configuration failed to validate, '\
-                         'check your config')
-        end
+        release = response.matches[0][0]
+        response.reply(get_rally_release_stat(release))
       end
 
       def rally_release_info(response)
-        if config_validate
-          get_rally_release_info(response)
-        else
-          response.reply('Configuration failed to validate, '\
-                         'check your config')
-        end
+        release = response.matches[0][0]
+        response.reply(get_rally_release_info(release))
       end
 
       private
 
-      def config_validate
-        (config.username && config.password) ? true : false
-      end
-
-      def get_rest
-        api_version = config.api_version ? config.api_version : 'v2.0'
-        RestClient::Resource.new(
-          "https://rally1.rallydev.com/slm/webservice/#{api_version}/",
-          user: config.username,
+      def get_rally_api
+        rally_api_config = {
+          base_url: 'https://rally1.rallydev.com/slm',
+          username: config.username,
           password: config.password,
-        )
+          version: config.api_version
+        }
+
+        RallyAPI::RallyRestJson.new(rally_api_config)
       end
 
-      def validate_release(rest, release)
-        query = "(Name = \"#{release}\")"
-        JSON.parse(
-          rest['release'].get(params: {query: query})
-        )['QueryResult']['TotalResultCount'] == 0
+      def validate_release(rally, release)
+        query = RallyAPI::RallyQuery.new()
+        query.type = 'release'
+        query.query_string = "(Name = \"#{release}\")"
+
+        rally.find(query).count > 0
       end
 
-      def get_rally_release_info(response)
-        rest = get_rest
-        release = response.matches[0][0]
-        if validate_release(rest, release)
-          response.reply("I can find anything about release: '#{release}'!")
-        else
-          query = "(Release.Name = \"#{release}\")"
-          defects = JSON.parse(
-            rest['defect'].get(
-              params: {
-                query: query,
-                fetch: 'true',
-                pagesize: '200',
-              }
-            )
-          )['QueryResult']['Results'].map {|r| r['FormattedID']}.join(' ')
-
-          us = JSON.parse(
-            rest['hierarchicalrequirement'].get(
-              params: {
-                query: query,
-                fetch: 'true',
-                pagesize: '200',
-              }
-            )
-          )['QueryResult']['Results'].map {|r| r['FormattedID']}.join(' ')
+      def get_rally_release_info(release)
+        rally = get_rally_api
+        if validate_release(rally, release)
+          query = RallyAPI::RallyQuery.new()
+          query.type = 'defect'
+          query.query_string = "(Release.Name = \"#{release}\")"
 
-          output = "Release info for: #{release}\n" \
-                   "Defects: #{defects}\n" \
-                   "User Stories: #{us}\n"
-          response.reply(output)
+          defects = rally.find(query).map {|r| r.read['FormattedID']}.join(' ')
+
+          query = RallyAPI::RallyQuery.new()
+          query.type = 'story'
+          query.query_string = "(Release.Name = \"#{release}\")"
+          us = rally.find(query).map {|r| r.read['FormattedID']}.join(' ')
+
+          "Release info for: #{release}\n" \
+          "Defects: #{defects}\n" \
+          "User Stories: #{us}\n"
+        else
+          "I can't find anything about release: '#{release}'!"
         end
       end
 
-      def get_rally_release_stat(response)
-        rest = get_rest
-        release = response.matches[0][0]
-        if validate_release(rest, release)
-          response.reply("I can find anything about release: '#{release}'!")
+      def get_rally_release_stat(release)
+        rally = get_rally_api
+        if validate_release(rally, release)
+          query = RallyAPI::RallyQuery.new()
+          query.type = 'defect'
+          query.query_string = "(Release.Name = \"#{release}\")"
+
+          de_count = rally.find(query).count
+
+          query = RallyAPI::RallyQuery.new()
+          query.type = 'story'
+          query.query_string = "(Release.Name = \"#{release}\")"
+
+          us_count = rally.find(query).count
+
+          "Release stats for: #{release}\n" \
+          "Defects count: #{de_count}\n" \
+          "User Story count: #{us_count}\n"
         else
-          query = "(Release.Name = \"#{release}\")"
-          de_result = JSON.parse(
-            rest['defect'].get(params: {query: query})
-          )['QueryResult']
-          de_count = de_result['TotalResultCount']
-
-          us_result = JSON.parse(
-            rest['hierarchicalrequirement'].get(params: {query: query})
-          )['QueryResult']
-          us_count = us_result['TotalResultCount']
-
-          output = "Release stats for: #{release}\n" \
-                   "Defects count: #{de_count}\n" \
-                   "User Story count: #{us_count}\n"
-          response.reply(output)
+          "I can find anything about release: '#{release}'!"
         end
       end
 
-      def get_rally_object(response)
-        rest = get_rest
-        type = response.matches[0][0].downcase
-        id = response.matches[0][1]
+      def get_rally_object(type, id)
+        rally = get_rally_api
+
         if @@key_map[type]
-          query_path = (@@key_map[type][:query_path] || @@key_map[type][:name])
-          link_path = (@@key_map[type][:link_path] || query_path)
-          query_result = JSON.parse(
-            rest[query_path].get(
-              params: {
-                query: "(FormattedId = #{id})",
-                fetch: 'true'
-              }
+          query = RallyAPI::RallyQuery.new()
+          query.type = @@key_map[type][:name]
+          query.query_string = "(FormattedID = \"#{type}#{id}\")"
+
+          result = rally.find(query)
+
+          if result.count < 1
+            response.reply(
+              "Can't find your so called #{@@key_map[type][:name]} " \
+              "#{type}#{id}"
             )
-          )['QueryResult']
-          if query_result['TotalResultCount'] == 0
-            response.reply("Can't find your so called #{type}#{id} in Rally!")
           else
-            result = query_result['Results'][0]
-            link = link_to_item(result, link_path)
-            output = ''
-            output += link + "\n" if link
-            output += "#{result['FormattedID']} - #{result['Name']}\n" \
-                      "Owner: #{result['Owner']['_refObjectName']}\n" \
-                      "Project: #{result['Project']['_refObjectName']}\n"
+            out = result[0].read
+            output = "#{link_to_item(out, @@key_map[type][:link_path])}\n" \
+                     "Owner: #{out['Owner']['_refObjectName']}\n" \
+                     "Project: #{out['Project']['_refObjectName']}\n"
             @@key_map[type][:extra_output].each do |field|
-              output += "#{field}: #{result[field]}\n" if
-                field.is_a?(String) && result[field]
-              output += "#{field[0]}: #{result[field[0]][field[1]]}\n" if
-                field.is_a?(Array) && result[field[0]]
+              output += "#{field}: #{out[field]}\n" if
+                field.is_a?(String) && out[field]
+              output += "#{field[0]}: #{out[field[0]][field[1]]}\n" if
+                field.is_a?(Array) && out[field[0]]
             end
-            output += "Description: #{strip_html(result['Description'])}\n"
-            response.reply(output)
+            output += "Description: #{strip_html(out['Description'])}\n"
           end
         else
-          response.reply("I don't know the type #{type}")
+          "I don't know the type #{type}"
         end
       end
 
       def link_to_item(result, type)
-        return false unless result['Project'] && result['ObjectID']
         project_id = result['Project']['_ref'].split('/')[-1]
         object_id = result['ObjectID']
         "https://rally1.rallydev.com/#/#{project_id}/detail/#{type}/#{object_id}"

data/lita-rally.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-rally"
-  spec.version       = "0.1.1"
+  spec.version       = "0.2.0"
   spec.authors       = ['Richard Li']
   spec.email         = ['evilcat@wisewolfsolutions.com']
-  spec.description   = %q{lita bot Rally plugin}
+  spec.description   = %q{Rally plugin for lita bot}
   spec.summary       = %q{lita bot Rally plugin}
   spec.homepage      = "https://github.com/ecwws/lita-rally"
   spec.license       = "MIT"
@@ -14,12 +14,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "lita", ">= 4.1"
-  spec.add_runtime_dependency "rest-client"
-  spec.add_runtime_dependency "json"
+  spec.add_runtime_dependency "lita", "~> 4.1"
+  spec.add_runtime_dependency "rest-client", "~> 0"
+  spec.add_runtime_dependency "json", "~> 0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "rspec", ">= 3.0.0"
+  spec.add_development_dependency "rake", "~> 0"
+  spec.add_development_dependency "rack-test", "~> 0"
+  spec.add_development_dependency "rspec", '~> 3.0', '>= 3.0.0'
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: lita-rally
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Richard Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -70,34 +70,37 @@ dependencies:
   name: rake
   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: rack-test
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -105,10 +108,13 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-description: lita bot Rally plugin
+description: Rally plugin for lita bot
 email:
 - evilcat@wisewolfsolutions.com
 executables: []