github-tv 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 394f431dfda18daf4d28a8029df24597a89ebc4d
-  data.tar.gz: 14805bcf47d60819849d5badf5636354983351db
+  metadata.gz: 327ec5b7370f80ce65cdd1e4773ae61ad3218c5d
+  data.tar.gz: efa2e8f9e11dbc5c04f3563153541abcfa9eb37a
 SHA512:
-  metadata.gz: 0b258ca144cbe17b1e46fec1ee22fa7a2f64a9a71ca1c420b918f6be1ff3839c5bc4d1e5f6b7f298b0cdf2aceb850f50c385e8231914c2c705dcc50563104e7a
-  data.tar.gz: 038227509055ee627dc807d168f14ca7eb70103b4720d4e5f2c299ca3e3af6897cc0b04182810c83300cbdc90591d7eae783e123080ca1e284fcf58d32a13d1e
+  metadata.gz: 63f4c41fc5f3f5e0ffc5025741b6d009f87c94c3ecb33db4b3bb73033a647c50a777749b4cc709d2fab86bf930843935bb6aff80f7b7bdc07fdc59baeaddb645
+  data.tar.gz: 436a344a4559f89361456acecabc685fe654311de9c4e7424106966e5d23ae4b376146a34a014d4dfbfdb0d447fbf8880afd564f1b112c678b0fdc220b4479a9

data/README.md

@@ -19,9 +19,15 @@ repos:
   - user2/repo2
 ```
 
+Optionally, you can set default path/url to config file.
+
+```bash
+git config --global github.tv.config *path/url for config*
+```
+
 ## Contributors
 
-* @gazay, @brainopia
+* @gazay, @brainopia, @igas, @aderyabin
 
 ## License
 

data/bin/github-tv

@@ -4,10 +4,34 @@ require_relative '../lib/github-tv'
 require 'io/console'
 require 'open-uri'
 
-config_location = ARGV.shift or abort 'Missing path/url for config'
-config = YAML.load open config_location
+def create_token(client, tfa=nil)
+  opts = {
+    scopes: ['public_repo'],
+    note: "github-tv #{Time.now}",
+    note_url: 'https://github.com/evilmartians/github-tv'
+  }
+  opts.merge!(headers: { 'X-GitHub-OTP' => tfa }) if tfa
+  client.create_authorization opts
+end
+
+
+
+
+config_location = ARGV.shift
+config_location ||= `git config github.tv.config`.chomp
 
-token = `git config github.tv`.chomp
+abort 'Missing path/url for config file' if config_location.empty?
+
+begin
+  config = YAML.load open config_location
+rescue Errno::ENOENT
+  abort 'Incorrect path to config file'
+rescue Psych::SyntaxError
+  abort 'Config file format is not YAML'
+end
+
+
+token = `git config github.tv.token`.chomp
 
 if token.empty?
   puts 'Please authenticate yourself to create a token for further usage.'
@@ -23,12 +47,16 @@ if token.empty?
     login: username,
     password: password
 
-  response = client.create_authorization \
-    scopes: ['public_repo'],
-    note: "github-tv #{Time.now}"
+  response = begin
+               create_token(client)
+             rescue Octokit::OneTimePasswordRequired
+               print 'Two-factor authentication code: '
+               tfa = gets.chomp
+               create_token(client, tfa)
+             end
 
   token = response.token
-  `git config --global github.tv #{token}`
+  `git config --global github.tv.token #{token}`
 end
 
 config['token'] = token

data/github-tv.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'github-tv'
-  gem.version       = '0.3'
+  gem.version       = '0.4'
   gem.license       = 'MIT'
   gem.authors       = ['brainopia', 'gazay']
   gem.email         = 'brainopia@evilmartians.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-tv
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - brainopia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit