git-ready 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 870c39dca4cd4196dfbd0dfe4d49b4d729310aca
-  data.tar.gz: 30c00a44f60cae18d54b713bd6ee80c9222ad145
+  metadata.gz: 20909dc24b57e356ffe93f86051050354ef4470d
+  data.tar.gz: 0acbc7fe13e51057b80cc322d4e280f1c9ad45e5
 SHA512:
-  metadata.gz: 92d75ef3c320c6cac267eacba952922672010787a0c4894d432873fc7ce51a80ac41ba1ede6389c691040926847f18b9e9ac5d266b3a98db7130ccb405e7a01b
-  data.tar.gz: 0e1d6d755a98e6b06d4df9a6271a146e323a19267b2c67e951d705e4a6249a284ffcc5d96560e08eca5720bdacadfd7cb756588915d2c9d9c30b83016c153788
+  metadata.gz: a46de39cc98533e059c8b54486599392ca06a14e06ffa36a5c992e80adc1273b2cbbb77a080225f513f1f664211396c155963490e7f11ef220709c416a4bc6a5
+  data.tar.gz: 2176c3cd298677411f3c79e21a199f711513e708e79dadd26809a0b8e1b62b8921aaa7583ab15e36b96602a66810cd2673a74c1e5003c9111d8b8989c5f7a5e3

data/VERSION

@@ -1 +1 @@
-0.8.11
+0.8.12

data/git-ready.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: git-ready 0.8.11 ruby lib
+# stub: git-ready 0.8.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "git-ready"
-  s.version = "0.8.11"
+  s.version = "0.8.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -34,6 +34,8 @@ Gem::Specification.new do |s|
     "lib/git-ready.rb",
     "lib/git-ready/github.rb",
     "lib/git-ready/interactive_setup.rb",
+    "lib/git-ready/interactive_setup/github_access_token.rb",
+    "lib/git-ready/interactive_setup/workspace.rb",
     "lib/git-ready/settings.rb",
     "lib/git-ready/workspace.rb",
     "spec/git-ready_spec.rb",

data/lib/git-ready/interactive_setup.rb

@@ -1,23 +1,25 @@
 require 'contracts'
-require 'highline/import'
-require 'octokit'
 require 'terminal-announce'
 require 'yaml'
 
+require_relative 'interactive_setup/workspace'
+require_relative 'interactive_setup/github_access_token'
+
 module InteractiveSetup
   include Contracts
 
-  Contract nil => Any
+  Contract None => Any
   def self.start
     Announce.info 'Entering Interactive Setup (^c to exit)'
     settings = {}
     settings['workspace'] = Workspace.setup
     settings['github_access_token'] = GitHubAccessToken.setup
-    save settings if validate settings
+    save settings if valid? settings
     exit
   end
 
-  def self.validate(settings)
+  Contract Hash => Bool
+  def self.valid?(settings)
     if settings.value? nil
       Announce.failure 'Settings are not valid.'
       Announce.info "Settings were #{settings}"
@@ -27,90 +29,11 @@ module InteractiveSetup
     end
   end
 
+  Contract Hash => Any
   def self.save(settings)
     config_path = File.expand_path '~/.config'
     Dir.mkdir config_path unless Dir.exist? config_path
     File.write "#{config_path}/git-ready.yaml", YAML.dump(settings)
     Announce.success "Configuration saved to #{config_path}"
   end
-
-  module Workspace
-    def self.setup
-      path = ask 'Enter the path to your workspace.'
-      actual_path = File.expand_path path
-      Announce.warning "No path given, assuming #{actual_path}" if path.empty?
-      if Dir.exist? actual_path
-        actual_path
-      else
-        Announce.failure 'Directory does not exist.'
-        setup
-      end
-    end
-  end
-
-  module GitHubAccessToken
-    def self.setup
-      Announce.info 'If you leave this blank, git-ready will do most of the work for you. As a fallback, you can generate your own at https://github.com/settings/tokens/new'
-      token = ask 'Enter your GitHub Personal Access Token:', String
-      generated = guided_generation if token.empty?
-      token = generated[:token] if generated
-      token_works?(token) ? token : setup
-    end
-
-    def self.guided_generation
-      login = ask_login
-      password = ask_password
-      generate login, password
-    rescue Octokit::OneTimePasswordRequired
-      Announce.info 'Your account has 2-Factor Authentication enabled. Awesome!'
-      headers = { 'X-GitHub-OTP' => ask('Enter a valid 2-Factor Auth Token') }
-      generate login, password, headers
-    end
-
-    def self.ask_login
-      login = ask('Enter your GitHub login:')
-      login.empty? ? ask_login : login
-    end
-
-    def self.ask_password
-      password = ask('Enter your GitHub password:') { |c| c.echo = '*' }
-      password.empty? ? ask_password : password
-    end
-
-    def self.generate(login, password, headers = {}, first_attempt = true)
-      github = Octokit::Client.new login: login, password: password
-      github.create_authorization(note: 'git-ready',
-                                  scopes: ['repo'],
-                                  headers: headers)
-    rescue Octokit::Unauthorized
-      Announce.failure 'Invalid Credentials'
-    rescue Octokit::UnprocessableEntity
-      if first_attempt
-        Announce.warning 'Found an old token. Replacing it.'
-        delete_existing_authorization github, headers
-        generate login, password, headers, false
-      else
-        Announce.failure "It looked like you had already issued a token, but deleting it didn't help. You're on your own at this point. You should should use the link at the start to generate a token manually."
-      end
-    end
-
-    def self.delete_existing_authorization(session, headers)
-      existing = old_auth_tokens('git-ready', session, headers).first[:id]
-      session.delete_authorization existing, headers: headers
-    end
-
-    def self.old_auth_tokens(note, session, headers)
-      session.authorizations(headers: headers).select do |auth|
-        auth[:note] == note
-      end
-    end
-
-    def self.token_works?(token)
-      github = Octokit::Client.new access_token: token
-      true if github.repos
-    rescue Octokit::Unauthorized
-      Announce.failure 'Invalid Credentials'
-      false
-    end
-  end
 end

data/lib/git-ready/interactive_setup/github_access_token.rb

@@ -0,0 +1,82 @@
+require 'contracts'
+require 'highline/import'
+require 'octokit'
+require 'terminal-announce'
+
+module InteractiveSetup
+  module GitHubAccessToken
+    include Contracts
+
+    Contract None => String
+    def self.setup
+      Announce.info 'If you leave this blank, git-ready will do most of the work for you. As a fallback, you can generate your own at https://github.com/settings/tokens/new'
+      token = ask 'Enter your GitHub Personal Access Token:', String
+      generated = guided_generation if token.empty?
+      token = generated[:token] if generated
+      token_works?(token) ? token : setup
+    end
+
+    Contract None => Hash
+    def self.guided_generation
+      login = ask_login
+      password = ask_password
+      generate login, password
+    rescue Octokit::OneTimePasswordRequired
+      Announce.info 'Your account has 2-Factor Authentication enabled. Awesome!'
+      headers = { 'X-GitHub-OTP' => ask('Enter a valid 2-Factor Auth Token') }
+      generate login, password, headers
+    end
+
+    Contract None => String
+    def self.ask_login
+      login = ask('Enter your GitHub login:')
+      login.empty? ? ask_login : login
+    end
+
+    Contract None => String
+    def self.ask_password
+      password = ask('Enter your GitHub password:') { |c| c.echo = '*' }
+      password.empty? ? ask_password : password
+    end
+
+    Contract String, String, Hash, Bool => Hash
+    def self.generate(login, password, headers = {}, first_attempt = true)
+      github = Octokit::Client.new login: login, password: password
+      github.create_authorization(note: 'git-ready',
+                                  scopes: ['repo'],
+                                  headers: headers)
+    rescue Octokit::Unauthorized
+      Announce.failure 'Invalid Credentials'
+    rescue Octokit::UnprocessableEntity
+      if first_attempt
+        Announce.warning 'Found an old token. Replacing it.'
+        delete_existing_authorization github, headers
+        generate login, password, headers, false
+      else
+        Announce.failure "It looked like you had already issued a token, but deleting it didn't help. You're on your own at this point. You should should use the link at the start to generate a token manually."
+      end
+    end
+
+    Contract Octokit::Client, Hash => Any
+    def self.delete_existing_authorization(session, headers)
+      existing = old_auth_tokens('git-ready', session, headers).first[:id]
+      session.delete_authorization existing, headers: headers
+    end
+
+    Contract String Octokit::Client, Hash => Any
+    def self.old_auth_tokens(note, session, headers)
+      session.authorizations(headers: headers).select do |auth|
+        auth[:note] == note
+      end
+    end
+
+    Contract String => Bool
+    def self.token_works?(token)
+      github = Octokit::Client.new access_token: token
+      true if github.repos
+    rescue Octokit::Unauthorized
+      Announce.failure 'Invalid Credentials'
+      false
+    end
+  end
+end

data/lib/git-ready/interactive_setup/workspace.rb

@@ -0,0 +1,19 @@
+require 'contracts'
+require 'highline/import'
+require 'terminal-announce'
+
+module InteractiveSetup
+  module Workspace
+    def self.setup
+      path = ask 'Enter the path to your workspace.'
+      actual_path = File.expand_path path
+      Announce.warning "No path given, assuming #{actual_path}" if path.empty?
+      if Dir.exist? actual_path
+        actual_path
+      else
+        Announce.failure 'Directory does not exist.'
+        setup
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-ready
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - Chris Olstrom
@@ -244,6 +244,8 @@ files:
 - lib/git-ready.rb
 - lib/git-ready/github.rb
 - lib/git-ready/interactive_setup.rb
+- lib/git-ready/interactive_setup/github_access_token.rb
+- lib/git-ready/interactive_setup/workspace.rb
 - lib/git-ready/settings.rb
 - lib/git-ready/workspace.rb
 - spec/git-ready_spec.rb