octoauth 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e3c5f9de8d5d04c3da935d4bd4326a096751c5a
-  data.tar.gz: b6282a33046a75bff72b9d5a95518618698dcbf5
+  metadata.gz: 9aa2e61a7ffe64cb1ca0a5c992a62afad06ba3f2
+  data.tar.gz: 3eea475acbea688c561c178afd6418f83695618a
 SHA512:
-  metadata.gz: ad5f2c360831e28e24281234026d762b3ef6a680cf64ecab46c6b6e7e2b94dc6d2e588b2d3ed98f230cbab0aef254ddd37d183ec8ddc46f8fb2406e151b11a6a
-  data.tar.gz: d96a4bf5d6e51f37365fcb67c42c58168634c146a0218886ffd4e2249b825bcc6445b694ecdbc3dd009b95f0233f2d19084b3ab7b295833012731c35b1ecf46a
+  metadata.gz: 34b473862aff7ce51daf7f2d3c17c2dfd98bd01bba08a521e9a93bac0fcbfa81ffa80b39f00baf17fb1fe56bbf024b80adc0017383aeea609ff60284745675ef
+  data.tar.gz: c9d43a74f10613864ec54a04382465f80772a5ecd463cb6277648fd44d6d0b0f46c866727757d46f2fb970a287bfcf1f76ab34bc5f0707794799f9fb3608e69a

data/CHANGELOG.md

@@ -1,4 +1,6 @@
-# 1.0.2 / Unreleased
+# 1.0.2 / 2015-05-03
+
+* [ENHANCEMENT] Fix option/param handling to be cleaner
 
 # 1.0.1 / 2015-02-20
 

data/lib/octoauth/auth.rb

@@ -19,55 +19,68 @@ module Octoauth
   ##
   # Authentication object
   class Auth
-    attr_reader :token
-
     def initialize(params = {})
-      params[:config_note] = "#{params[:note]}"
-      if params[:api_endpoint]
-        params[:config_note] << "--#{params[:api_endpoint]}"
-      end
-      @config = ConfigFile.new file: params[:file], note: params[:config_note]
-      @token = load_token params
-      save if params[:autosave]
+      parse_params!(params)
+      @config = ConfigFile.new file: @options[:file], note: config_note
+      save if @options[:autosave]
     end
 
     def save
-      fail 'No token to save' unless @token
+      fail 'No token to save' unless token
       fail 'No file given for config' unless @config.file
       @config.token = @token
       @config.write
     end
 
+    def token
+      @token ||= load_token
+    end
+
     private
 
-    def load_token(params = {}) # rubocop:disable Metrics/AbcSize
+    def parse_params!(params)
+      @options = params.subset(
+        :file, :note, :autosave, :scopes,
+        :login, :password, :twofactor, :api_endpoint
+      )
+    end
+
+    def config_note
+      return @options[:note] unless @options[:api_endpoint]
+      "#{@options[:note]}--#{@options[:api_endpoint]}"
+    end
+
+    def prompt!(needs2fa = false)
+      @options[:login] ||= PROMPTS[:login].ask
+      @options[:password] ||= PROMPTS[:password].ask
+      @options[:scopes] ||= DEFAULT_SCOPES
+      return unless needs2fa
+      @options[:twofactor] ||= PROMPTS[:twofactor].ask
+      @options[:headers] = { 'X-GitHub-OTP' => @options[:twofactor] }
+    end
+
+    def load_token(needs2fa = false)
       return @config.token if @config.token
-      params[:login] ||= PROMPTS[:login].ask
-      params[:password] ||= PROMPTS[:password].ask
-      params[:twofactor] ||= PROMPTS[:twofactor].ask if params[:needs2fa]
-      params[:scopes] ||= DEFAULT_SCOPES
-      if params[:twofactor]
-        params[:headers] = { 'X-GitHub-OTP' => params[:twofactor] }
-      end
-      authenticate! params
+      prompt!(needs2fa)
+      authenticate
     end
 
-    def authenticate!(params = {})
+    def authenticate
       client = Octokit::Client.new(
-        params.subset(:login, :password, :api_endpoint)
+        @options.subset(:login, :password, :api_endpoint)
       )
       client.create_authorization(
-        params.subset(:note, :scopes, :headers)
+        @options.subset(:note, :scopes, :headers)
       ).token
     rescue Octokit::OneTimePasswordRequired
-      load_token params.merge(needs2fa: true)
+      load_token(true)
     rescue Octokit::UnprocessableEntity
-      check_existing_token client, params
+      check_existing_token client
     end
 
-    def check_existing_token(client, params = {})
-      client.authorizations(params.subset(:headers))
-        .find { |x| x[:note] == params[:note] }.token
+    def check_existing_token(client)
+      client.authorizations(@options.subset(:headers))
+        .find { |x| x[:note] == @options[:note] }.token
     end
   end
 end

data/octoauth.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'octoauth'
-  s.version     = '1.0.1'
+  s.version     = '1.0.2'
   s.date        = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = 'Auth token helper for GitHub API'
@@ -16,10 +16,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'octokit', '~> 3.8.0'
   s.add_dependency 'userinput', '~> 1.0.0'
 
-  s.add_development_dependency 'rubocop', '~> 0.29.0'
+  s.add_development_dependency 'rubocop', '~> 0.30.0'
   s.add_development_dependency 'rake', '~> 10.4.0'
-  s.add_development_dependency 'coveralls', '~> 0.7.1'
+  s.add_development_dependency 'coveralls', '~> 0.8.0'
   s.add_development_dependency 'rspec', '~> 3.2.0'
   s.add_development_dependency 'fuubar', '~> 2.0.0'
-  s.add_development_dependency 'webmock', '~> 1.20.0'
+  s.add_development_dependency 'webmock', '~> 1.21.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoauth
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.0
+        version: 0.30.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.21.0
 description: Lightweight wrapper to sanely handle OAuth tokens with Octokit
 email: me@lesaker.org
 executables: []