agile_notifier 2.0 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 381bca60d1cdcef7b0e28496244aa7213c097821
-  data.tar.gz: 7dc6ba3581331d1287e11ef0591d81f74d3e1a72
+  metadata.gz: f6dab087af32f66ddcfc47df973466feee564490
+  data.tar.gz: 097165226c80d53eecc59b9043c9f7dcaa98af02
 SHA512:
-  metadata.gz: 14097412a80312dcfadb891f78e9c24da4105a177f5e5145e84acb5b74aa101945da21f572d1396da69228b55e04783d982fdc25bb678ec35ea0b9a32e2114d8
-  data.tar.gz: 1b12fb78c97282349b18065f615d0924d3f67e5413987bc074d347353b176db1c2883016cef054520d5795c0acd3bb1926a86b1c841c2e426fcbacbbcc1cdded
+  metadata.gz: f5b09f872f73a43807f151f77ac5b4fa05898d6efa9c54de10b7581a08a7d48572708b9c1c61c6bcee1887b332700cd5cef0b0a9e241555175117ed6043bb2fe
+  data.tar.gz: 58ca64e4c1b5c655a37f1d73aae00d7b0923ebf7f3dda83ad1a85fb7dfa7ac83736395e2fbd19459ce41d569b1e6d4b65984b7ac411aa210da7af98a595a8874

data/.gitignore

@@ -1 +1,2 @@
 .idea/
+Gemfile.lock

data/README.md

@@ -18,29 +18,29 @@ AgileNotifier::Configuration.set do
 
   scm_url 'https://github.xyzcompany.com'
   scm_repo user: 'your_user_name', repo: 'your_repository_name'
+  # scm_auth is optional, depends on if your github API access requires authentication
+  # if authentication is required, please choose either username & password or OAuth access token (latter one is recommended)
+  scm_auth username: 'github_login_username', password: 'github_login_password' # optional
+  scm_auth token: 'a1b2c3d4e5f6f0f0f0f0f0f0f0f0f6e5d4c3b2a1' # optional
   scm_get 'Github', enterprise: true
 
   # for non-enterprise version
   # scm_url 'https://api.github.com'
   # scm_repo user: 'your_user_name', repo: 'your_repository_name'
   # scm_get 'Github'
-
-  speak 'en'
-  play 'Boing' # Mac OSX TTS voice name(optional field), unnecessary for other OS
-
-  alert_on_fail
-  alert_on_fix
-  alert_on_unstable
   
   its_url 'https://jira.atlassian.com'
   its_auth 'jira_username', 'jira_password'
   its_get 'Jira'
   its_set_wip 'BAM', 'project = BAM AND status = Resolved AND resolution = Unresolved', 3
   its_set_wip 'XXX', 'project = XXX AND status = Resolved AND resolution = Unresolved', 5
-  
+
   speak 'en'
-  play 'Alex'
-  
+  play 'Boing' # Mac OSX TTS voice name(optional field), unnecessary for other OS
+
+  alert_on_fail
+  alert_on_fix
+  alert_on_unstable
   alert_on_wip
 end
 ```

data/agile_notifier.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.name        = 'agile_notifier'
   s.version     = AgileNotifier::VERSION
   s.license     = 'MIT'
-  s.date        = '2014-08-25'
+  s.date        = '2014-10-02'
   s.summary     = %q{agile_notifier alerts you via making wonderful noises when your Continuous Integration status changes.}
   s.description = %q{agile_notifier alerts you via making wonderful noises when your Continuous Integration status changes.  It totally makes software development more agile and more fun.}
   s.authors     = ['Jing Li']

data/lib/agile_notifier/configuration.rb

@@ -36,12 +36,22 @@ module AgileNotifier
       @scm_repos.push(repo)
     end
     
+    def scm_auth(auth)
+      username = auth.fetch(:username, nil)
+      password = auth.fetch(:password, nil)
+      token = auth.fetch(:token, nil)
+      @scm_authentication = username && password ? {:basic_auth => {:username => username, :password => password}} : nil
+      @scm_authentication = {:Authorization => "token #{token}"} if token
+    end
+    
     def scm_get(scm_type, args = {})
-      enterprise = args.fetch(:enterprise, false)
+      enterprise = args.fetch(:enterprise, false)      
+      params = [@scm_url]
+      params.push(@scm_authentication) if @scm_authentication
       if enterprise
-        @scm = @current_module.const_get(scm_type).new_enterprise_version(@scm_url)
+        @scm = @current_module.const_get(scm_type).new_enterprise_version(*params)
       else
-        @scm = @current_module.const_get(scm_type).new(@scm_url)
+        @scm = @current_module.const_get(scm_type).new(*params)
       end
       @scm_repos.each do |repo|
         @scm.add_repository(repo)

data/lib/agile_notifier/github.rb

@@ -9,13 +9,25 @@ module AgileNotifier
 
     ENTERPRISE_API = '/api/v3'
     USERAGENT = 'AgileNotifier'
+    
+    @@headers = {:headers => {'User-Agent' => USERAGENT}}
+    @@auth = nil
 
-    def initialize(url)
+    def initialize(url, args = {})
       super
+      basic_auth = args.fetch(:basic_auth, nil)
+      access_token = args.fetch(:Authorization, nil)
+      if basic_auth
+        @@auth = {:basic_auth => basic_auth}
+      elsif access_token
+        @@headers[@@headers.keys.first] = @@headers.values.first.merge({'Authorization' => access_token})
+      end
       if url.include?(ENTERPRISE_API)
         status_url = url + '/zen'
         begin
-          status = HTTParty.get(status_url).code
+          args = [status_url]
+          args.push(@@auth && @@auth.has_key?(:basic_auth) ? @@headers.merge(@@auth) : @@headers)
+          status = HTTParty.get(*args).code
           availability = ( status == 200 )
         rescue => e
           puts e.message
@@ -30,12 +42,14 @@ module AgileNotifier
     end
 
     class << self
-      def new_enterprise_version(url)
-        new(url + ENTERPRISE_API)
+      def new_enterprise_version(url, args = {})
+        new(url + ENTERPRISE_API, args)
       end
 
       def get_value(key, url)
-        get_value_of_key(key, url, :headers => {'User-Agent' => USERAGENT})
+        args = @@headers
+        args.merge!(@@auth) if @@auth && @@auth.has_key?(:basic_auth)
+        get_value_of_key(key, url, args)
       end
     end
 

data/lib/agile_notifier/scm.rb

@@ -1,10 +1,11 @@
 module AgileNotifier
   class SCM
-    attr_accessor :url, :repositories
+    attr_accessor :url, :repositories, :args
 
-    def initialize(url)
+    def initialize(url, args = {})
       @url = url
       @repositories = []
+      @args = args
     end
 
     def add_repository(repository)

data/lib/agile_notifier.rb

@@ -1,5 +1,5 @@
 Dir[(File.expand_path(File.dirname(__FILE__)) + "/agile_notifier/*.rb")].each { |file| require file }
 
 module AgileNotifier
-  VERSION = '2.0'
+  VERSION = '2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agile_notifier
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '2.1'
 platform: ruby
 authors:
 - Jing Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -81,7 +81,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - agile_notifier.gemspec

data/Gemfile.lock

@@ -1,20 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    httparty (0.11.0)
-      multi_json (~> 1.0)
-      multi_xml (>= 0.5.2)
-    json (1.8.0)
-    metaclass (0.0.1)
-    mocha (0.14.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.8.0)
-    multi_xml (0.5.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  httparty
-  json
-  mocha