one_pass 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cc1151fd6e205e25446f3ccc96ea2ade11ae65f
-  data.tar.gz: 38a4224636c6cdd21c05bb4e468b95326ebbe271
+  metadata.gz: 6f2bcb52f001a05838904a9be14b38bae3dd1838
+  data.tar.gz: 1f656e5330fb00832e47aed98a89d17071374317
 SHA512:
-  metadata.gz: 4b8ecca56031bbfc20f1f59be2386f52ba18cf57cf9067738498b7fccf1f0fda6c68071719f2d4c9b3b4efada10f137bd08f04aead0948ba91400d3fb1522c27
-  data.tar.gz: c24eed919126dae1d4dd16f763d29690f2a4cd2dd5d2e1e87b1a10ac6202709f9e5a2be3c1bc3a4bee8b8fb5922c31cdbe562adc66a20e1e158de632f5c40cc7
+  metadata.gz: 22e33d577ee5caa98095f025de437a5d38dfea09e44eb3e0fbb08ac655477e2426fe1f03d115530eb94be018d89d38745bf566a8efcaecbf93eb1efea61753ad
+  data.tar.gz: 76e0424fd775a338e2665db91edb45ac23ca86f149065ad38d1f669c4eca191e50dbe3550fcb622f2b7e991b1cd43add78c9e6f7d7dec364642293b8c7554674

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    one_pass (0.3.0)
+    one_pass (0.4.0)
       thor (~> 0.19)
       ttyname (~> 1.0)
 
@@ -46,4 +46,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.11.2
+   1.13.2

data/README.markdown

@@ -16,7 +16,7 @@ gem install one_pass
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, commit, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/lib/OnePass/application.rb

@@ -1,28 +1,41 @@
+require "English"
+
 module OnePass
   # OnePass Application
   class Application
-    CONFIG_PATH='~/.one_pass'
+    CONFIG_PATH = '~/.one_pass'.freeze
 
     def initialize(vault_path = nil)
       @vault_path = get_vault vault_path
       @vault = OpVault.new @vault_path
 
-      error_message = nil
+      check_for_dependencies
       prompter = OnePass::Password.new(vault_path: @vault_path)
+      password_loop prompter
+    ensure
+      prompter && prompter.done
+    end
+
+    def check_for_dependencies
+      unless installed? 'pinentry --version'
+        puts 'Please install the `pinentry` program.'
+        puts '  on macOS, we recommend using Homebrew: `brew install pinentry`.'
+        exit 127
+      end
+    end
+
+    def password_loop(prompter)
+      error_message = nil
       loop do
         password = prompter.prompt error_message
         exit if password.nil? # cancelled
         begin
-          @vault.unlock password
-          @vault.load_items
+          @vault.unlock password && @vault.load_items
           break
         rescue => error
           error_message = error.message
-          next
         end
       end
-    ensure
-      prompter.done
     end
 
     def get_vault(vault_path = nil)
@@ -39,11 +52,11 @@ module OnePass
       item = @vault.find(/#{query}/i).first
       data = @vault.item_overview item
       unless %i( uuid url title ).include? reply_type
-         data.merge!(@vault.item_detail item)
+        data.merge!(@vault.item_detail(item))
       end
 
       case reply_type
-      when *%i( uuid url title )
+      when %i( uuid url title )
         data[reply_type.to_s]
       when :username
         data['fields'].find({}) { |field| field['designation'] == 'username' }['value']
@@ -56,19 +69,27 @@ module OnePass
 
     def search(query)
       @vault.find(/#{query}/i).collect do |item|
-        data = (@vault.item_overview item).merge(@vault.item_detail item)
+        data = (@vault.item_overview item).merge(@vault.item_detail(item))
         {
           uuid: data['uuid'],
           title: data['title'],
-          username: data['fields'].find({}) { |field| field['designation'] == 'username' }['value']
+          username: data['fields'].find({}) do |field|
+            field['designation'] == 'username'
+          end['value']
         }
       end
     end
 
+    def installed?(program)
+      `#{program}`
+      result = $CHILD_STATUS
+      result.exitstatus != 127
+    end
+
     def self.save(vault_path = nil)
-      app = self.new vault_path # if succeeds, path & pw is good
+      new vault_path # if succeeds, path & pw is good
       path = File.expand_path CONFIG_PATH
-      File.open path, File::CREAT|File::TRUNC|File::RDWR do |file|
+      File.open path, File::CREAT | File::TRUNC | File::RDWR do |file|
         file.write "path=#{File.expand_path vault_path}\n"
       end
     end

data/lib/OnePass/cli.rb

@@ -7,12 +7,12 @@ require 'OnePass/password'
 module OnePass
   # OnePass CLI
   class CLI < Thor
-    SHOW_OPTIONS = %w( all username password url uuid title )
+    SHOW_OPTIONS = %w( all username password url uuid title ).freeze
 
-    map %w[--version -v] => :__version
-    desc "--version, -v", "Print the current version"
+    map %w(--version -v) => :__version
+    desc '--version, -v', 'Print the current version'
     def __version
-      puts "#{File.basename $0} version #{OnePass::VERSION}"
+      puts "#{File.basename $PROGRAM_NAME} version #{OnePass::VERSION}"
     end
 
     desc 'login', 'Save a 1Password vault and verify password'
@@ -31,6 +31,7 @@ module OnePass
     SHOW_OPTIONS.each do |switch|
       option switch.to_sym, type: :boolean
     end
+
     def show(name)
       # Check for multiple mutex args
       type = SHOW_OPTIONS.each_with_object(Hash.new) do |k, hash|
@@ -57,7 +58,7 @@ module OnePass
     desc 'search QUERY', 'Perform fuzzy search for items in your vault, shows uuid, title and username'
     def search(query)
       app = OnePass::Application.new
-      puts JSON.pretty_generate(app.search query)
+      puts JSON.pretty_generate(app.search(query))
     end
 
     map ls: :list

data/lib/OnePass/password.rb

@@ -3,15 +3,17 @@ require 'ttyname'
 module OnePass
   # Fork out to `pinentry` for password
   class Password
-    DESCRIPTION = 'Please enter your 1Password master password for the following vault:'
+    DESCRIPTION = 'Please enter your 1Password master password for the following vault:'.freeze
     DEFAULT = {
       title: '1Password CLI',
       prompt: 'Master Password: '
-    }
+    }.freeze
 
     def initialize(opts = {})
       @config = OpenStruct.new DEFAULT.merge(opts)
-      @config.description ||= "#{DESCRIPTION}%0a#{@config.vault_path}" if @config.vault_path
+      if @config.vault_path
+        @config.description ||= "#{DESCRIPTION}%0a#{@config.vault_path}"
+      end
     end
 
     def prompt(error_message = nil)
@@ -19,7 +21,7 @@ module OnePass
       @pipe = IO.popen 'pinentry', 'r+'
       check
       send_settings
-      get_password
+      fetch_password
       @password
     end
 
@@ -41,15 +43,13 @@ module OnePass
       option 'display', ENV['DISPLAY']
     end
 
-    def get_password
+    def fetch_password
       @password = ''
       send 'GETPIN'
-      while true
+      loop do
         case response = @pipe.gets
-        when /^D .*/
-          @password = response[2..-1].chomp
-        when /^OK/
-          break
+        when /^D .*/ then @password = response[2..-1].chomp
+        when /^OK/ then break
         else
           @password = nil
           break

data/lib/OnePass/version.rb

@@ -1,3 +1,3 @@
 module OnePass
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: one_pass
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Seth Voltz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor