watson-ruby 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aed185a7a70ff98378f975ffb12794bda13dc75b
-  data.tar.gz: ad4b6c8f0c1a60d3b2c937650709890289b99a39
+  metadata.gz: 6526764e5a9d056f1e208763be9871e9097c7848
+  data.tar.gz: 13b5605c8e07c6e05ce2b035180c5327a115cbb6
 SHA512:
-  metadata.gz: 2e2a9cb224f671452bd2184151099644d7061ffb8a76fa2808a8234b0f38527ec1cdd8957d385a0f3de3c6290672b928c21b8c2ce831e9f8903f2ad16c1bc870
-  data.tar.gz: 8f078dd73fc44966cb4c2ffe2df577b3c6ea3fe36923f1ef1783244dfacd5726ec5d446e77943871cd5e8956d40b8031f6cb652ade5b1109ae0f1d79d40e4ae5
+  metadata.gz: 385b0d1fc3a4398fa63671ef1e96ac497c2e81924e2d6b8877b1df36bbea08b6e8bfca3edd2c3860a894d970deddd9cf18d51bfa2faf3b237ff569e192c2e70b
+  data.tar.gz: ba4a0830d8b1600da0b0506da9cedef1effb4c0cde820cc67d9b3e2261dc42a30c557201aed2a6b0df1e934c321c727da7d23f4c8d86de49661eee40f4870ddf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    watson-ruby (1.1.3)
+    watson-ruby (1.2.0)
       json
 
 GEM

data/bin/watson

@@ -1,18 +1,11 @@
 #!/usr/bin/env ruby
-# coding: utf-8
-
-# [review] - Using own funky path loading because traditional way seems wrong?
-# Commented out version is traditional, seen in many apps. If you use that and
-# look at load_path you get path/../lib (I'd expect those to be separate?)
-# My funky version adds path/., path/bin, path/assets separately
-# Maybe I don't get how the load path is supposed to look though...
-
-#$:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
-$:.unshift *%w[. assets lib].map { |m| __dir__.gsub(/\/bin(.?)+/, '') + '/' + m }
-#p($:)
-
-
-require 'watson'
 
+lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
+begin
+  require 'watson'
+rescue LoadError
+  $LOAD_PATH << lib
+  require 'watson'
+end
 
 Watson::Command.execute(*ARGV)

data/lib/watson/config.rb

@@ -48,6 +48,8 @@ module Watson
     attr_accessor :github_valid
     # GitHub API key generated from Remote::GitHub setup
     attr_accessor :github_api
+    # GitHub Endpoint (for GitHub Enterprise)
+    attr_accessor :github_endpoint
     # GitHub repo associated with current directory + watson config
     attr_accessor :github_repo
     # Hash to hold list of all GitHub issues associated with repo
@@ -104,21 +106,22 @@ module Watson
       # Remote options
       @remote_valid   = false
 
-      @github_valid   = false
-      @github_api   = ""
-      @github_repo  = ""
-      @github_issues  = {:open   => Hash.new(),
-                :closed => Hash.new()
-                }
+      @github_valid    = false
+      @github_api      = ""
+      @github_endpoint = ""
+      @github_repo     = ""
+      @github_issues   = {:open   => Hash.new(),
+                          :closed => Hash.new()
+                          }
 
       # Keep API param (and put username there) for OAuth update later
       @bitbucket_valid  = false
       @bitbucket_api    = ""
       @bitbucket_pw     = ""
       @bitbucket_repo   = ""
-      @bitbucket_issues   = {:open   => Hash.new(),
-                   :closed => Hash.new()
-                  }
+      @bitbucket_issues = {:open   => Hash.new(),
+                           :closed => Hash.new()
+                          }
     end
 
 
@@ -362,6 +365,12 @@ module Watson
           debug_print "GitHub API: #{ @github_api }\n"
 
 
+        when "github_endpoint"
+          # Same as above
+          @github_endpoint = _line.chomp!
+          debug_print "GitHub Endpoint #{ @github_endpoint }\n"
+
+
         when "github_repo"
           # Same as above
           @github_repo = _line.chomp!

data/lib/watson/github.rb

@@ -31,7 +31,7 @@ module Watson
       print BOLD + "Obtaining OAuth Token for GitHub...\n" + RESET
 
       # Check config to make sure no previous API exists
-      unless config.github_api.empty? && config.github_repo.empty?
+      unless config.github_api.empty? && config.github_repo.empty? && config.github_endpoint.empty?
         Printer.print_status "!", RED
         print BOLD + "Previous GitHub API + Repo is in RC, are you sure you want to overwrite?\n" + RESET
         print "      (Y)es/(N)o: "
@@ -39,18 +39,39 @@ module Watson
         # Get user input
         _overwrite = $stdin.gets.chomp
         if ["no", "n"].include?(_overwrite.downcase)
-          print "\n"
+          print "\n\n"
           Printer.print_status "x", RED
           print BOLD + "Not overwriting current GitHub API + repo info\n" + RESET
           return false
         end
       end
 
+      print "\n\n"
 
       Printer.print_status "!", YELLOW
       print BOLD + "Access to your GitHub account required to make/update issues\n" + RESET
       print "      See help or README for more details on GitHub/Bitbucket access\n\n"
 
+      Printer.print_status "!", GREEN
+      print BOLD + "Is this a GitHub Enterprise account?\n" + RESET
+      print "      (Y)es/(N)o: "
+
+      # Get user input
+      _enterprise = $stdin.gets.chomp
+      if ["yes", "y"].include?(_enterprise.downcase)
+        print "\n\n"
+        print BOLD + "GitHub API Endpoint: " + RESET
+        _endpoint = $stdin.gets.chomp.chomp('/')
+        if _endpoint.empty?
+          Printer.print_status "x", RED
+          print BOLD + "Input blank. Please enter your API endpoint!\n\n" + RESET
+          return false
+        end
+      else
+        _endpoint = ''
+      end
+
+      print "\n"
 
       # [todo] - Don't just check for blank password but invalid as well
       # Poor mans username/password grabbing
@@ -75,6 +96,8 @@ module Watson
         return false
       end
 
+      _endpoint = "https://api.github.com" if _endpoint.empty?
+
       # HTTP Request to get OAuth Token
       # GitHub API v3 - http://developer.github.com/v3/
 
@@ -82,15 +105,15 @@ module Watson
       # Auth URL for GitHub + SSL
       # Repo scope + notes for watson
       # Basic auth with user input
-      opts = {:url        => "https://api.github.com/authorizations",
-          :ssl        => true,
-          :method     => "POST",
-          :basic_auth => [_username, _password],
-          :data       => {"scopes" => ["repo"],
-                      "note" => "watson",
-                      "note_url" => "http://watson.goosecode.com/" },
-          :verbose    => false
-           }
+      opts = {:url        => "#{ _endpoint }/authorizations",
+              :ssl        => true,
+              :method     => "POST",
+              :basic_auth => [_username, _password],
+              :data       => {"scopes" => ["repo"],
+                              "note" => "watson",
+                              "note_url" => "http://watson.goosecode.com/" },
+              :verbose    => false
+             }
 
       _json, _resp  = Watson::Remote.http_call(opts)
 
@@ -105,9 +128,11 @@ module Watson
         return false
       end
 
-      # Store API key obtained from POST to @config.github_api
+      # Store endpoint and API key obtained from POST to @config.github_api
+      config.github_endpoint = _endpoint
       config.github_api = _json["token"]
-      debug_print "Config GitHub API Key updated to: #{ config.github_api }\n"
+      debug_print "Config GitHub API Endpoint updated to: #{ config.github_endpoint }\n"
+      debug_print "Config GitHub API Key updated to:      #{ config.github_api }\n"
 
 
       # Get repo information, if blank give error
@@ -144,14 +169,14 @@ module Watson
       # Label URL for GitHub + SSL
       #
       # Auth token
-      opts = {:url        => "https://api.github.com/repos/#{ _owner }/#{ _repo }/labels",
-          :ssl        => true,
-          :method     => "POST",
-          :auth   => config.github_api,
-          :data       => {"name" => "watson",
-                      "color" => "00AEEF" },
-          :verbose    => false
-           }
+      opts = {:url        => "#{ _endpoint }/repos/#{ _owner }/#{ _repo }/labels",
+              :ssl        => true,
+              :method     => "POST",
+              :auth       => config.github_api,
+              :data       => {"name" => "watson",
+                              "color" => "00AEEF" },
+              :verbose    => false
+             }
 
       _json, _resp  = Watson::Remote.http_call(opts)
 
@@ -195,14 +220,14 @@ module Watson
       # All setup has been completed, need to update RC
       # Call config updater/writer from @config to write config
       debug_print "Updating config with new GitHub info\n"
-      config.update_conf("github_api", "github_repo")
+      config.update_conf("github_api", "github_repo", "github_endpoint")
 
       # Give user some info
       print "\n"
       Printer.print_status "o", GREEN
       print BOLD + "GitHub successfully setup\n" + RESET
       print "      Issues will now automatically be retrieved from GitHub by default\n"
-      print "      Use -p, --push to post issues to GitHub\n"
+      print "      Use -u, --update to post issues to GitHub\n"
       print "      See help or README for more details on GitHub/Bitbucket access\n\n"
 
       return true
@@ -228,12 +253,12 @@ module Watson
       # Get all open tickets
       # Create options hash to pass to Remote::http_call
       # Issues URL for GitHub + SSL
-      opts = {:url        => "https://api.github.com/repos/#{ config.github_repo }/issues?labels=watson&state=open",
-          :ssl        => true,
-          :method     => "GET",
-          :auth   => config.github_api,
-          :verbose    => false
-           }
+      opts = {:url        => "#{ config.github_endpoint }/repos/#{ config.github_repo }/issues?labels=watson&state=open",
+              :ssl        => true,
+              :method     => "GET",
+              :auth       => config.github_api,
+              :verbose    => false
+             }
 
       _json, _resp  = Watson::Remote.http_call(opts)
 
@@ -256,11 +281,11 @@ module Watson
       # Get all closed tickets
       # Create option hash to pass to Remote::http_call
       # Issues URL for GitHub + SSL
-      opts = {:url        => "https://api.github.com/repos/#{ config.github_repo }/issues?labels=watson&state=closed",
-          :ssl        => true,
-          :method     => "GET",
-          :auth   => config.github_api,
-          :verbose    => false
+      opts = {:url        => "#{ config.github_endpoint }/repos/#{ config.github_repo }/issues?labels=watson&state=closed",
+              :ssl        => true,
+              :method     => "GET",
+              :auth       => config.github_api,
+              :verbose    => false
            }
 
       _json, _resp  = Watson::Remote.http_call(opts)
@@ -330,22 +355,22 @@ module Watson
       # Create the body text for the issue here, too long to fit nicely into opts hash
       # [review] - Only give relative path for privacy when posted
       _body = "__filename__ : #{ issue[:path] }\n" +
-          "__line #__ : #{ issue[:line_number] }\n" +
-          "__tag__ : #{ issue[:tag] }\n" +
-          "__md5__ : #{ issue[:md5] }\n\n" +
-          "#{ issue[:context].join }\n"
+              "__line #__ : #{ issue[:line_number] }\n" +
+              "__tag__ : #{ issue[:tag] }\n" +
+              "__md5__ : #{ issue[:md5] }\n\n" +
+              "#{ issue[:context].join }\n"
 
       # Create option hash to pass to Remote::http_call
       # Issues URL for GitHub + SSL
-      opts = {:url        => "https://api.github.com/repos/#{ config.github_repo }/issues",
-          :ssl        => true,
-          :method     => "POST",
-          :auth   => config.github_api,
-          :data   => { "title" => issue[:title] + " [#{ issue[:path] }]",
-                   "labels" => [issue[:tag], "watson"],
-                   "body" => _body },
-          :verbose    => false
-           }
+      opts = {:url        => "#{ config.github_endpoint }/repos/#{ config.github_repo }/issues",
+              :ssl        => true,
+              :method     => "POST",
+              :auth       => config.github_api,
+              :data       => { "title" => issue[:title] + " [#{ issue[:path] }]",
+                               "labels" => [issue[:tag], "watson"],
+                               "body" => _body },
+              :verbose    => false
+             }
 
       _json, _resp  = Watson::Remote.http_call(opts)
 

data/lib/watson/version.rb

@@ -1,3 +1,3 @@
 module Watson
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watson-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - nhmood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json