git_reflow 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6033d9ac0481348f75d715588d5ae35f451b53e8
-  data.tar.gz: 6865bb6dfdad09ada836eb0e5cb08a2f8bc7b29f
+  metadata.gz: 387fb2f3483c3e18b0bf7ba9073ae491b95c760a
+  data.tar.gz: 2390815525f3338aba546b0c7f54d5e5827c5d13
 SHA512:
-  metadata.gz: 1054c1140b333a61c70030757b5a713b2d23a876c2912d6d18887c4d946e7e8b8e92f4277529bf8075ed9112e6b701ed79a2102fe51759d7a415229b5414d189
-  data.tar.gz: 9720ebbd2a3ee378cc830940de30170b58ed1fe970264f45807fad418f03413d40faf8099ff947bfd9bf7e2f77d436eaa0b6dc554c6d83cc4d0be58e331231bb
+  metadata.gz: eae7a39aec6c92600d8438e3d33d956a3212a1598c769e55d58b99f738e5f7567240e90f8887052f46408fe82237938e34ffc0ddff1697db554c669d616de07b
+  data.tar.gz: 29de749587d60ddcbf05fd7dbe4adaa89b7e05d8753860d130edc3fc859b8985e6104712fbc895fc4e2c146c6494bc4d389fd021742000d8e569293ae87e047f

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    git_reflow (0.4.0)
+    git_reflow (0.4.1)
       colorize (= 0.6.0)
-      github_api (= 0.12.1)
+      github_api (= 0.12.2)
       gli (= 2.12.2)
       highline
       httpclient
@@ -28,18 +28,18 @@ GEM
     diff-lcs (1.2.5)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    github_api (0.12.1)
+    github_api (0.12.2)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.2)
+      hashie (>= 3.3)
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.3)
       oauth2
     gli (2.12.2)
     hashie (3.3.1)
     highline (1.6.21)
-    httpclient (2.4.0)
+    httpclient (2.5.1)
     json (1.7.5)
     json_pure (1.8.1)
     jwt (1.0.0)

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) {{year}} {{fullname}}
+Copyright (c) 2014 Reenhanced L.L.C.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/git_reflow.gemspec

@@ -31,7 +31,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('highline')
   s.add_dependency('httpclient')
   s.add_dependency('json_pure')
-  s.add_dependency('github_api', '0.12.1')
+  s.add_dependency('github_api', '0.12.2')
 
   s.post_install_message = "You need to setup your GitHub OAuth token\nPlease run 'git-reflow setup'"
 end

data/lib/git_reflow/git_server/git_hub.rb

@@ -34,7 +34,7 @@ module GitReflow
       end
 
       def authenticate(options = {silent: false})
-        if connection
+        if connection and self.class.oauth_token.length > 0
           unless options[:silent]
             puts "Your GitHub account was already setup with: "
             puts "\tUser Name: #{self.class.user}"
@@ -42,8 +42,8 @@ module GitReflow
           end
         else
           begin
-            gh_user     = ask("Please enter your GitHub username: ")
-            gh_password = ask("Please enter your GitHub password (we do NOT store this): ") { |q| q.echo = false }
+            gh_user     = options[:user] || ask("Please enter your GitHub username: ")
+            gh_password = options[:password] || ask("Please enter your GitHub password (we do NOT store this): ") { |q| q.echo = false }
 
             @connection = ::Github.new do |config|
               config.basic_auth = "#{gh_user}:#{gh_password}"
@@ -60,13 +60,39 @@ module GitReflow
               authorization = @connection.oauth.create scopes: ['repo'], note: "git-reflow (#{run('hostname', loud: false).strip})"
             end
 
-            oauth_token   = authorization.token
-
-            self.class.oauth_token = oauth_token
+            self.class.oauth_token = authorization.token
             puts "\nYour GitHub account was successfully setup!"
 
+          rescue ::Github::Error::Unauthorized => e
+            if e.inspect.to_s.include?('two-factor')
+              two_factor_code         = ask("Please enter your two-factor authentication code: ")
+              github_authorizations   = @connection.oauth.class.new(
+                basic_auth: "#{gh_user}:#{gh_password}",
+                endpoint:   GitServer::GitHub.api_endpoint,
+                site:       GitServer::GitHub.site_url,
+                ssl:        {:verify => false},
+                headers:    { "X-GitHub-OTP" => two_factor_code }
+              )
+
+              previous_authorizations = github_authorizations.all.select {|auth|
+                auth.note == "git-reflow (#{run('hostname', loud: false).strip})"
+              }
+
+              self.class.user = gh_user
+
+              if previous_authorizations.any?
+                authorization = previous_authorizations.last
+              else
+                authorization = github_authorizations.create scopes: ['repo'], note: "git-reflow (#{run('hostname', loud: false).strip})"
+              end
+
+              self.class.oauth_token = authorization.token
+              puts "\nYour GitHub account was successfully setup!"
+            else
+              puts "\nGithub Authentication Error: #{e.inspect}"
+            end
           rescue StandardError => e
-            puts "\nInvalid username or password: #{e.inspect}"
+            puts "\nInvalid username or password: #{e.body}"
           else
             puts "\nYour GitHub account was successfully setup!"
           end
@@ -101,18 +127,22 @@ module GitReflow
         GitReflow::Config.get('github.user')
       end
 
+      def self.user=(github_user)
+        GitReflow::Config.set('github.user', github_user, local: @@project_only)
+      end
+
       def self.oauth_token
         GitReflow::Config.get('github.oauth-token')
       end
 
-      def self.oauth_token=(oauth_token, options = {})
+      def self.oauth_token=(oauth_token)
         GitReflow::Config.set('github.oauth-token', oauth_token, local: @@project_only)
         oauth_token
       end
 
       def self.api_endpoint
         endpoint         = GitReflow::Config.get('github.endpoint')
-        (endpoint.length > 0) ? endpoint : ::Github::Configuration.new.endpoint
+        (endpoint.length > 0) ? endpoint : ::Github.endpoint
       end
 
       def self.api_endpoint=(api_endpoint)
@@ -122,7 +152,7 @@ module GitReflow
 
       def self.site_url
         site_url     = GitReflow::Config.get('github.site')
-        (site_url.length > 0) ? site_url : ::Github::Configuration.new.site
+        (site_url.length > 0) ? site_url : ::Github.site
       end
 
       def self.site_url=(site_url)

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,14 +172,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.2
 description: Git Reflow manages your git workflow.
 email:
 - dev@reenhanced.com