gistrb 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a2aefb784623a1659b2bafd3eeeec8e050766df6
-  data.tar.gz: fb813f490cf60efb217ea2b3f46d439ac52b4daf
+SHA256:
+  metadata.gz: f57c0cc5c36dd8ef2baebaeb474fd3b0b4d91312869375f5fc9df0f1c5780cc5
+  data.tar.gz: 5a061644fd3aa98c3de9a64eccb65e9fd0d89cf87e7efed27f373ce5227bb6a2
 SHA512:
-  metadata.gz: 98aca49aa436b184c517c61e5b7fdb8acffab6b900cbf279d7656e85696bf7ec7a6d2450547befeb8c63b1c04338a72fb585768a63df1975e202c1009414bdcf
-  data.tar.gz: 1fb6927724c4cdef4f360fed6139fa9909b3980bee60503123034eaae08d8d43d018c0b04bbab615292b107c003651615e610e904f9ed446be8b1920e7d04d6a
+  metadata.gz: 1ca6612dd6b0846aaaeb2f511fc92fc2902c867e62e28586f45f1ebfcad02178f148ea93e381eaccc06cd345a209529ea694589a89062cd716060832d903db6e
+  data.tar.gz: 9daca6856b2667e75649a5126f13e0a2bc41d69d2bfbaff28b74eafb23025409cf21b8e24b9ba24654f0f05fe679c0a297c6ccd1247c4be0822439f44ab646f2

data/.rubocop.yml

@@ -0,0 +1,5 @@
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false

data/.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
 rvm:
 - 2.2
-- jruby-19mode
-- rbx-2
 before_install: gem install bundler -v 1.15
 deploy:
   provider: rubygems

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Cameron Roe
+Copyright (c) 2018 Cameron Roe
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -29,6 +29,7 @@ Option                                 | Description
  -p | --public                    | Post the Gist as public (it posts as private by default)
  -d [DESC] | --description [DESC] | Use [DESC] as the description for the Gist
  -c | --clipboard                 | Automatically put the created Gist URL into your clipboard (beta)
+ -n | --netrc                     | Utilize .netrc file for storing/retrieving authorization token
 
 ## Installation:
 Using RubyGems, simply run this command:
@@ -45,4 +46,4 @@ sudo apt-get install xclip
 ## License
 MIT License
 
-Copyright © 2017 Cameron Roe
+Copyright © 2018 Cameron Roe

data/Rakefile

@@ -1,5 +1,5 @@
 require 'bundler/gem_tasks'
 
 task :default do
-    puts "Need to add tests"
+  puts 'Need to add tests'
 end

data/bin/gistrb

@@ -13,6 +13,10 @@ OptionParser.new do |opts|
     options[:sign_in] = s
   end
 
+  opts.on('-n', '--netrc', 'Use information from netrc when signing in') do |n|
+    options[:netrc] = n
+  end
+
   opts.on('--sign-out', 'Clear out saved user') do |s|
     options[:sign_out] = s
   end
@@ -34,11 +38,6 @@ end.parse!
 files = ARGV.clone
 ARGV.clear
 
-# Get anything sent by STDIN to support cat and pasting.
-if !STDIN.tty? || files.empty? then
-	stdin = STDIN.read
-end
-
 if options[:sign_out]
   File.delete(Gist::ACCESS_TOKEN_PATH) if File.exist?(Gist::ACCESS_TOKEN_PATH)
   exit
@@ -48,12 +47,16 @@ if options[:sign_in]
   print 'Username: '
   username = gets.chomp
   password = Gist::Helpers.get_password
-  @user = Gist::User.new(username, password)
+  @user = Gist::User.new(username, password, options[:netrc])
   @user.authenticate
+  exit
 end
 
+# Get anything sent by STDIN to support cat and pasting.
+stdin = STDIN.read if !STDIN.tty? || files.empty?
+
 if options[:user]
-  @user = Gist::User.new
+  @user = Gist::User.new(nil, nil, options[:netrc])
   @user.authenticate
   unless @user.access_token
     STDERR.puts 'ERROR: There is no user saved. You need to sign in.'

data/gistrb.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'clipboard', '~> 1.1'
   spec.add_dependency 'ffi', '~> 1.9.18' if RUBY_PLATFORM =~ /win32/i
   spec.add_dependency 'highline', '~> 1.7'
+  spec.add_dependency 'netrc', '~> 0.11.0'
 end

data/lib/gist.rb

@@ -2,6 +2,8 @@ require 'net/https'
 require 'highline/import'
 require 'json'
 require 'clipboard'
+require 'netrc'
+require 'socket'
 
 # Library requires
 require 'gist/user'

data/lib/gist/clipboard.rb

@@ -2,7 +2,7 @@ module Gist
   # Helper class for clipboard functions
   class Clipboard
     # Wraps clipboard functionality
-    def self::copy(str)
+    def self.copy(str)
       Clipboard.clear
       Clipboard.copy(str)
     end

data/lib/gist/helpers.rb

@@ -2,7 +2,7 @@ module Gist
   # Helper methods for getting input
   class Helpers
     # Method to wrap a highline call to hide a passworded input
-    def self::get_password(prompt = 'Password: ')
+    def self.get_password(prompt = 'Password: ')
       ask(prompt) { |q| q.echo = false }
     end
   end

data/lib/gist/post.rb

@@ -15,27 +15,23 @@ module Gist
     end
 
     def submit(stdin)
-    	unless stdin.nil? then
-    		@source_files['STDIN'] = {
-    			'content' => stdin
-    		}
-    	end
+      unless stdin.nil?
+        @source_files['STDIN'] = {
+          'content' => stdin
+        }
+      end
       body = {
         'files' => @source_files,
         'public' => @public,
         'description' => @description
       }.to_json
       headers ||= {}
-      unless @user.nil?
-        headers['Authorization'] = "token #{@user.access_token}"
-      end
+      headers['Authorization'] = "token #{@user.access_token}" unless @user.nil?
       response = @http.post('/gists', body, headers)
       JSON.parse(response.body)['html_url']
     end
 
-    private
-
-    def load_code(filename)
+    private def load_code(filename)
       file = File.open(filename)
       file_str = ''
       file.each do |line|

data/lib/gist/user.rb

@@ -6,9 +6,10 @@ module Gist
     attr_accessor :access_token # Personal access token
 
     # Create the GistUser instance
-    def initialize(username = nil, password = nil)
-      @username = username
-      @password = password
+    def initialize(username = nil, password = nil, netrc = nil)
+      @username ||= username
+      @password ||= password
+      @netrc ||= netrc
       @http = Net::HTTP.new(Gist::API_URL, Gist::API_PORT)
       @http.use_ssl = true
       @access_token = load_token if saved?
@@ -42,20 +43,38 @@ module Gist
     end
 
     private def saved?
-      File.exist?(Gist::ACCESS_TOKEN_PATH)
+      if @netrc.nil?
+        File.exist?(Gist::ACCESS_TOKEN_PATH)
+      else
+        netrc = Netrc.read
+        _username, token = netrc['api.github.com']
+        !token.nil?
+      end
     end
 
     private def save
-      unless Dir.exist?(File.dirname(Gist::ACCESS_TOKEN_PATH))
-        Dir.mkdir(File.dirname(Gist::ACCESS_TOKEN_PATH))
+      if @netrc.nil?
+        unless Dir.exist?(File.dirname(Gist::ACCESS_TOKEN_PATH))
+          Dir.mkdir(File.dirname(Gist::ACCESS_TOKEN_PATH))
+        end
+        token_file = File.new(Gist::ACCESS_TOKEN_PATH, 'w+')
+        token_file << @access_token
+        token_file.close
+      else
+        netrc = Netrc.read
+        netrc['api.github.com'] = @username, @access_token
+        netrc.save
       end
-      token_file = File.new(Gist::ACCESS_TOKEN_PATH, 'w+')
-      token_file << @access_token
-      token_file.close
     end
 
     private def load_token
-      File.readlines(Gist::ACCESS_TOKEN_PATH).first
+      if @netrc.nil?
+        File.readlines(Gist::ACCESS_TOKEN_PATH).first
+      else
+        netrc = Netrc.read
+        _username, token = netrc['api.github.com']
+        token
+      end
     end
 
     private def auth_obj
@@ -64,7 +83,7 @@ module Gist
       req['Content-Type'] = 'application/json'
       req.body = {
         scopes: ['gist'], # Only need Gist scope
-        note: 'Gist access for GistRB client',
+        note: "Gist access for GistRB client on #{Socket.gethostname}",
         note_url: 'https://github.com/cameronbroe/gistrb'
       }.to_json
       req

data/lib/gist/version.rb

@@ -1,3 +1,3 @@
 module Gist
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gistrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Cameron Roe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2018-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
 description: 
 email:
 - cameron@cameronbroe.com
@@ -77,6 +91,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE
@@ -112,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A command-line utility to manage GitHub Gists