stash_notifier 1.0.0 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDFmOTBjNjZhMGI5MWFkNzUyZWQwZDQyMmVjNTdmY2ZlMjk1ZTFiZg==
+    ZDQ5MWE1ZGYxMTgwNjVkZDUzYTFmYzkzZTZmMWIzMWY3ZTc0MDcwYQ==
   data.tar.gz: !binary |-
-    NGMwNTNkY2I2YjY3MTA5MWU2NGE1MGM5MGFmOGEyMzZlYTQ4ZjA0YQ==
+    OTlhZTZjYTYxYzZiNGE1ZTc5MjkwNjcyMTQwODdmM2UzOTg1MGJlMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2YzYzQwNWUxOTczZTdhZTZmOWQxMzlmY2FjMjMyMWVjOTVmMmNlOWEyNTY2
-    NTFiZGU3ODBlOTgzMjA2NTFiMjhjMzczMjJmMjZlYzZkMGYxOGMyNzU1Njg2
-    MDUwMDE5Y2U0MTVhM2I2MmQ2MmEzMjFiZWJiYzhhZmNmZDliOTM=
+    NTgxOGE5NGQxYjcxODQwNzFjOTUxZWYzYmQxZjVhNjMwNDZiYWE1NTIxYjhh
+    MGZhMDVlOWVhM2JlNDdjZmVhZGYyYzFiYzg4MGQzMmUyZjQ4ZDU0N2UwMGY4
+    ZDhhMjI0NjEyNzZmNmQwM2VmNWVhOGRmZDVmOWNkZmU1NzdkMTA=
   data.tar.gz: !binary |-
-    NjkwMTE3ZGEwNjNkMTY0Yjg5OGI1ZGNmOWIyOTZjYTQyZjc1ZmIzYTdkOTc0
-    YzUzZDM2MThhN2IxNDY0ZjFkY2JhNzk0MmM5MTNmNzAzZmEzOTEyNThlZmEz
-    Y2UwZjVhMTM5YTBkOTRiNjE5MDgxYzA4YWU1YWU0YTlhNjcyYmI=
+    MmMwZDlmNGM3MjI2ZjZmMmM4ZDBlZDViNjkyMTUyOGRlYTdhZTM3Y2JkYTQ4
+    NGIxMDkwMjI0ZDkzZTJhM2FkNmJkMWY2YjMzYTQwNDUxM2FiODA0ZTg2ZjBh
+    OWU1ZjczZTc1MDc2NzcyZTNkZjBkOThlOGFjNTc1YWI4N2I3NmY=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## version 1.1.0
+Fixes #4: Rename "job\_" parameters to "build\_" and add `build_name` param
+
 ## version 1.0.0
 1. Add ability to specify Chef passwords data bag name
 2. Add ability to specify Chef config file (e.g. knife.rb or client.rb)

data/bin/notify

@@ -20,7 +20,7 @@ require 'slop'
 require 'stash_notifier'
 
 # EXAMPLE:
-# notify -u my_chef_user -c e2b8a34c60eeec41d3e9d83f60d3b288e909c1eb -r failed -k foobar -l http://jenkins.my_company.com/jenkins/view/FOO/job/Deploy/17/console -d 'Jenkins deploy job'
+# notify -s https://git.mycompany.com -u my_chef_user -c e2b8a34c60eeec41d3e9d83f60d3b288e909c1eb -r failed -k REPO-MASTER -n REPO-MASTER-12 -l http://jenkins.my_company.com/jenkins/view/FOO/job/Deploy/17/console -d 'Jenkins deploy job'
 
 opts = Slop.parse( help: true, strict: true, arguments: true ) do
   banner 'Usage: notify [options]'
@@ -29,10 +29,11 @@ opts = Slop.parse( help: true, strict: true, arguments: true ) do
   on :g, :git_commit=, 'Git commit sha'
   on :d, :data_bag=, 'Name of Chef passwords data bag'
   on :c, :config=, 'Chef config file'
-  on :r, :job_status=, 'CI server job status, e.g. INPROGRESS, SUCCESSFUL, FAILED'
-  on :k, :job_key=, 'CI server job key'
-  on :l, :job_url=, 'URL to CI server job results'
-  on :d, :job_description=, 'CI server job description'
+  on :r, :build_status=, 'CI server job status, e.g. INPROGRESS, SUCCESSFUL, FAILED'
+  on :k, :build_key=, 'CI server job name'
+  on :n, :build_name=, 'CI server build name'
+  on :l, :build_url=, 'URL to CI server job results'
+  on :d, :build_description=, 'CI server job description'
 end
 
 args = opts.to_hash

data/lib/stash_notifier/version.rb

@@ -14,5 +14,5 @@
 # limitations under the License.
 
 class StashNotifier
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/stash_notifier.rb

@@ -20,11 +20,11 @@ require "stash_notifier/version"
 
 class StashNotifier
   attr_accessor :stash_url, :stash_user, :git_commit,
-    :job_key, :job_url, :job_description, :http_client, :pwd_vault
+    :build_key, :build_name, :build_url, :build_description, :http_client, :pwd_vault
 
-  attr_reader :job_status
+  attr_reader :build_status
 
-  VALID_JOB_STATUSES = %w{ INPROGRESS SUCCESSFUL FAILED }
+  VALID_BUILD_STATUSES = %w{ INPROGRESS SUCCESSFUL FAILED }
   STASH_BUILD_STATUS_PATH = 'rest/build-status/1.0/commits'
 
   DEFAULTS = {
@@ -35,24 +35,25 @@ class StashNotifier
   def initialize(args)
     args = DEFAULTS.merge(args) {|key, arg, default| arg.nil? ? default : arg}
 
-    @stash_url       = args[:stash_url]
-    @stash_user      = args[:stash_user]
-    @git_commit      = args[:git_commit]
-    self.job_status  = args[:job_status]
-    @job_key         = args[:job_key]
-    @job_url         = args[:job_url]
-    @job_description = args[:job_description]
-    @http_client     = args[:http_client]
-    @pwd_vault       = args[:pwd_vault]
+    @stash_url         = args[:stash_url]
+    @stash_user        = args[:stash_user]
+    @git_commit        = args[:git_commit]
+    self.build_status  = args[:build_status]
+    @build_key         = args[:build_key]
+    @build_name        = args[:build_name]
+    @build_url         = args[:build_url]
+    @build_description = args[:build_description]
+    @http_client       = args[:http_client]
+    @pwd_vault         = args[:pwd_vault]
   end
 
-  def job_status=(new_job_status)
-    new_job_status = new_job_status.strip.upcase
+  def build_status=(new_build_status)
+    new_build_status = new_build_status.strip.upcase
 
-    if VALID_JOB_STATUSES.include?(new_job_status)
-      @job_status = new_job_status
+    if VALID_BUILD_STATUSES.include?(new_build_status)
+      @build_status = new_build_status
     else
-      raise ArgumentError, "'#{new_job_status}' is not a valid Stash Build Status! Valid job statuses are #{VALID_JOB_STATUSES}."
+      raise ArgumentError, "'#{new_build_status}' is not a valid Stash Build Status! Valid job statuses are #{VALID_BUILD_STATUSES}."
     end
   end
 
@@ -88,10 +89,11 @@ class StashNotifier
 
   def format_build_result
     build_result = {
-      state:       job_status,
-      key:         job_key,
-      url:         job_url,
-      description: job_description
+      state:       build_status,
+      key:         build_key,
+      name:        build_name,
+      url:         build_url,
+      description: build_description
     }
     build_result.to_json
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stash_notifier
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Doug Ireton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday