sym 2.8.0 → 2.10.0

data/codecov.yml

@@ -0,0 +1,29 @@
+codecov:
+  require_ci_to_pass: no
+
+  notify:
+    wait_for_ci: yes
+
+parsers:
+  v1:
+    include_full_missed_files: true # To use with Ruby so we see files that have NO tests written
+
+coverage:
+  range: 50..75
+  round: down
+  precision: 1
+  status:
+    project:
+      default: off
+      sym:
+        target: 70%
+        threshold: 10%
+        informational: true
+        if_not_found: success
+        if_ci_failed: error
+        paths:
+          - lib/
+flags:
+  sym:
+    paths:
+      - lib/

data/exe/keychain

@@ -32,7 +32,7 @@ puts data ? \
   Sym::App::KeyChain.new(key_name).send(action.to_sym, data) :
   Sym::App::KeyChain.new(key_name).send(action.to_sym)
 rescue StandardError => e
-  STDERR.puts "#{e.message.red}"
+  warn "#{e.message.red}"
 end
 
 

data/exe/sym

@@ -1,4 +1,7 @@
 #!/usr/bin/env ruby
+# vim: ft=ruby
+
+require_relative '../lib/ruby_warnings'
 
 lib_path = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH << lib_path if File.exist?(lib_path) && !$LOAD_PATH.include?(lib_path)
@@ -6,12 +9,12 @@ $LOAD_PATH << lib_path if File.exist?(lib_path) && !$LOAD_PATH.include?(lib_path
 require 'sym'
 require 'sym/app'
 
-#ARGV.any?{ |a| a =~ /^-/ } ?
+# ARGV.any?{ |a| a =~ /^-/ } ?
 begin
   exit ::Sym::App::CLI.new(ARGV.dup).execute
 rescue Interrupt => e
   STDERR.flush
-  STDERR.puts "Interrupt, #{e.message}, exiting."
+  warn "Interrupt, #{e.message}, exiting."
   STDERR.flush
   exit 1
 end

data/lib/ruby_warnings.rb

@@ -0,0 +1,7 @@
+ruby_version = RbConfig::CONFIG['MAJOR'].to_i * 10 + RbConfig::CONFIG['MINOR'].to_i
+if ruby_version >= 27
+  Warning[:deprecated] = false
+  ENV['RUBYOPT'] = '-W:no-deprecated'
+else
+  ENV['RUBYOPT']="-W0"
+end

data/lib/sym.rb

@@ -21,17 +21,11 @@ Sym::Configuration.configure do |config|
   # When nil is selected, providers are auto-detected.
   config.password_cache_default_provider = nil
   config.password_cache_arguments        = {
-    drb:       {
-      opts: {
-        uri: 'druby://127.0.0.1:24924'
-      }
-    },
     memcached: {
       args: %w(127.0.0.1:11211),
       opts: { namespace:  'sym',
               compress:   true,
-              expires_in: config.password_cache_timeout
-      }
+              expires_in: config.password_cache_timeout}
 
     }
   }

data/lib/sym/app.rb

@@ -66,7 +66,7 @@ module Sym
       self.exit_code = 1
     end
 
-    def self.is_osx?
+    def self.osx?
       Gem::Platform.local.os.eql?('darwin')
     end
 

data/lib/sym/app/args.rb

@@ -12,7 +12,7 @@ module Sym
 
       def initialize(opts)
         self.opts             = opts
-        self.selected_options = opts.keys.reject { |k| !opts[k] }
+        self.selected_options = opts.keys.select { |k| opts[k] }
       end
 
       def specify_key?
@@ -33,10 +33,11 @@ module Sym
       end
 
       def provided_options
-        opts.to_hash.keys.reject { |k| !opts[k] }
+        opts.to_hash.keys.select { |k| opts[k] }
       end
 
       private
+
       def do?(list)
         !(list & selected_options).empty?
       end

data/lib/sym/app/cli.rb

@@ -60,7 +60,6 @@ module Sym
 
 
       def initialize(argv, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = nil)
-
         self.stdin  = stdin
         self.stdout = stdout
         self.stderr = stderr
@@ -140,7 +139,7 @@ module Sym
       private
 
       def log(*args)
-        Sym::App.log(*args, **(opts.to_hash))
+        Sym::App.log(*args, **opts.to_hash)
       end
 
       def error(hash)

data/lib/sym/app/cli_slop.rb

@@ -55,7 +55,7 @@ module Sym
           o.separator 'Create a new private key:'.yellow
           o.bool      '-g', '--generate',           '           generate a new private key'
           o.bool      '-p', '--password',           '           encrypt the key with a password'
-          if Sym::App.is_osx?
+          if Sym::App.osx?
             o.string '-x', '--keychain',            '[key-name] '.blue + 'write the key to OS-X Keychain'
           end
 

data/lib/sym/app/commands.rb

@@ -37,7 +37,7 @@ module Sym
         # Sort commands based on the #dependencies array, which itself is sorted
         # based on command dependencies.
         def sorted_commands
-          @sorted_commands ||= self.commands.to_a.sort_by{|klass| dependencies.index(klass.short_name) }
+          @sorted_commands ||= self.commands.to_a.sort_by{ |klass| dependencies.index(klass.short_name) }
           @sorted_commands
         end
 

data/lib/sym/app/commands/base_command.rb

@@ -73,7 +73,7 @@ module Sym
         end
 
         def add_to_keychain_if_needed(key)
-          if opts[:keychain] && Sym::App.is_osx?
+          if opts[:keychain] && Sym::App.osx?
             Sym::App::KeyChain.new(opts[:keychain], opts).add(key)
           else
             key

data/lib/sym/app/commands/bash_completion.rb

@@ -8,21 +8,24 @@ module Sym
         try_after :generate_key, :open_editor, :encrypt, :decrypt
 
         def ok
-          '[OK]'.bold.green
+          ' '.bold.green
         end
 
         def execute
           file = opts[:bash_support]
 
           out = ''
-          Sym::Constants::Bash::Config.each_pair do |key, config|
+          Sym::Constants::Bash::CONFIG.each_pair do |key, config|
             script_name = key.to_s
-            if (!File.exist?(config[:dest])) ||
-                (File.exist?(config[:dest]) && !FileUtils.identical?(config[:source], config[:dest]))
-              FileUtils.cp(config[:source], config[:dest])
-              out << "#{} installing #{config[:dest].bold.blue }...\n"
-            else
+
+            # This removes the old version of this file.
+            remove_old_version(out, config[:dest])
+
+            if File.exist?(config[:dest]) && File.read(config[:source]) == File.read(config[:dest])
               out << "#{ok} file #{config[:dest].bold.blue } exists, and is up to date.\n"
+            else
+              FileUtils.cp(config[:source], config[:dest])
+              out << "#{ok} installing #{config[:dest].bold.blue }...\n"
             end
 
             out << if File.exist?(file)
@@ -40,7 +43,7 @@ module Sym
           out << "\nPlease reload your terminal session to activate bash completion\n"
           out << "and other installed BASH utilities.\n"
           out << "\nAlternatively, just type #{"source #{file}".bold.green} to reload BASH.\n"
-          out << "Also — go ahead and try running #{"sym -h".bold.blue} and #{"symit -h".bold.blue}.\n"
+          out << "Also — go ahead and try running #{'sym -h'.bold.blue} and #{'symit -h'.bold.blue}.\n"
         end
 
         private
@@ -51,6 +54,15 @@ module Sym
           end
         end
 
+        def remove_old_version(out, file)
+          if file =~ /\.bash$/
+            old_file = file.gsub(/\.bash$/, '')
+            if File.exist?(old_file)
+              out << "Removing old version — #{old_file.bold.magenta}..."
+              FileUtils.rm_f old_file
+            end
+          end
+        end
       end
     end
   end

data/lib/sym/app/commands/open_editor.rb

@@ -48,7 +48,7 @@ module Sym
         end
 
         def timestamp
-          @timestamp ||= Time.now.to_a.select { |d| d.is_a?(Fixnum) }.map { |d| '%02d' % d }[0..-3].reverse.join
+          @timestamp ||= Time.now.to_a.select { |d| d.is_a?(Integer) }.map { |d| '%02d' % d }[0..-3].reverse.join
         end
 
         def process(code)

data/lib/sym/app/commands/password_protect_key.rb

@@ -16,10 +16,10 @@ module Sym
           the_key = self.key
 
           if opts[:password]
-             encrypted_key, password = encrypt_with_password(the_key)
-             add_password_to_the_cache(encrypted_key, password)
-             the_key = encrypted_key
-           end
+            encrypted_key, password = encrypt_with_password(the_key)
+            add_password_to_the_cache(encrypted_key, password)
+            the_key = encrypted_key
+          end
 
           add_to_keychain_if_needed(the_key)
 

data/lib/sym/app/commands/show_examples.rb

@@ -56,7 +56,7 @@ Diff:
 # (c) 2016 Konstantin Gredeskoul.  All rights reserved.'.green.bold)
 
 
-          if Sym::App.is_osx?
+          if Sym::App.osx?
           output << example(comment: 'generate a new password-encrypted key, save it to your Keychain:',
                             command: 'sym -gpcx staging.key')
 

data/lib/sym/app/input/handler.rb

@@ -27,7 +27,13 @@ module Sym
         end
 
         def prompt(message, color)
-          raise Sym::Errors::CantReadPasswordNoTTY.new('key requires a password, however STDIN is not a TTY') unless stdin.tty?
+          unless STDIN.isatty && STDIN.tty?
+            raise Sym::Errors::CantReadPasswordNoTTY.new('key requires a password, however STDIN is not a TTY')
+          end
+          highline(message, color)
+        end
+
+        def highline(message, color)
           HighLine.new(stdin, stderr).ask(message.bold) { |q| q.echo = '•'.send(color) }
         end
 

data/lib/sym/app/keychain.rb

@@ -39,11 +39,13 @@ module Sym
         self.key_name = key_name
         self.opts     = opts
         self.class.validate!
-        stderr_off
+        opts[:trace] ? stderr_on : stderr_off
       end
 
       def add(password)
-        execute command(:add, "-U -w '#{password}' ")
+        delete rescue nil
+        sleep 0.1
+        execute command(:add, " -T /usr/bin/security -w '#{password}' ")
       end
 
       def find
@@ -56,10 +58,14 @@ module Sym
 
       def execute(command)
         command += ' 2>/dev/null' if stderr_disabled
-        puts "> #{command.yellow.green}" if opts[:verbose]
+        puts "> #{command.yellow}" if opts[:verbose]
         output = `#{command}`
         result = $?
-        raise Sym::Errors::KeyChainCommandError.new("Command error: #{result}, command: #{command}") unless result.success?
+        unless result.success?
+          warn "> ERROR running command:\n>   $ #{output.red}" if !stderr_disabled && opts[:verbose]
+          raise Sym::Errors::KeyChainCommandError.new("Command error: #{result}, command: #{command}")
+        end
+
         output.chomp
       rescue Errno::ENOENT => e
         raise Sym::Errors::KeyChainCommandError.new("Command error: #{e.message}, command: #{command}")
@@ -80,16 +86,16 @@ module Sym
         out << extras if extras
         out = out.join
         # Do not actually ever run these commands on non MacOSX
-        out = "echo Run this –\"#{out}\", on #{Sym::App.this_os}?\nAre you sure?" unless Sym::App.is_osx?
+        out = "echo Run this –\"#{out}\", on #{Sym::App.this_os}?\nAre you sure?" unless Sym::App.osx?
         out
       end
 
       def base_command(action)
         [
-          "security #{action}-#{self.class.sub_section} ",
-          "-a '#{self.class.user}' ",
-          "-D '#{self.class.kind}' ",
-          "-s '#{self.key_name}' "
+          "/usr/bin/security #{action}-#{self.class.sub_section} ",
+          "-a #{self.class.user} ",
+          "-D #{self.class.kind} ",
+          "-s #{self.key_name} "
         ]
       end
     end

data/lib/sym/app/output/noop.rb

@@ -7,7 +7,8 @@ module Sym
         required_option :quiet
 
         def output_proc
-          ->(*) { ; }
+          ->(*) do
+          end
         end
       end
     end

data/lib/sym/app/password/cache.rb

@@ -36,7 +36,7 @@ module Sym
           self.enabled = opts[:enabled]
           self.verbose = opts[:verbose]
           self.timeout = opts[:timeout] || ::Sym::Configuration.config.password_cache_timeout
-          self.provider = Providers.provider(opts[:provider], opts[:provider_opts] || {})
+          self.provider = Providers.provider(opts[:provider], **(opts[:provider_opts] || {}))
           self.enabled = false unless self.provider
           self
         end

data/lib/sym/app/password/providers.rb

@@ -15,7 +15,7 @@ module Sym
             self.providers << provider_class
           end
 
-          # Detect first instance that is "alive?" and return it.
+          # Detect first instance tht is "alive?" and return it.
           def detect
             self.detected ||= self.providers.inject(nil) do |instance, provider_class|
               instance || (p = provider_class.new; p.alive? ? p : nil)
@@ -38,7 +38,7 @@ module Sym
 
           def provider_from_argument(p, **opts, &block)
             case p
-              when String, Symbol
+            when String, Symbol
                 provider_class_name = "#{p.to_s.capitalize}Provider"
                 Sym::App::Password::Providers.const_defined?(provider_class_name) ?
                   Sym::App::Password::Providers.const_get(provider_class_name).new(**opts, &block) :
@@ -53,4 +53,3 @@ end
 
 # Order is important — they are tried in this order for auto detect
 require 'sym/app/password/providers/memcached_provider'
-require 'sym/app/password/providers/drb_provider'

data/lib/sym/app/private_key/decryptor.rb

@@ -31,10 +31,10 @@ module Sym
             rescue ::OpenSSL::Cipher::CipherError => e
               input_handler.puts 'Invalid password. Please try again.'
 
-              if ((retries += 1) < 3)
+              if (retries += 1) < 3
                 retry
               else
-                raise(Sym::Errors::InvalidPasswordProvidedForThePrivateKey.new('Invalid password.'))
+                raise(Sym::Errors::WrongPasswordForKey.new('Invalid password.'))
               end
             end
           else

data/lib/sym/app/private_key/detector.rb

@@ -23,11 +23,10 @@ module Sym
         # procs on a given string.
         def read!
           KeySourceCheck::CHECKS.each do |source_check|
-            if result = source_check.detect(self) rescue nil
-              if key_ = normalize_key(result.key)
-                key_source_ = result.to_s
-                return key_, key_source_
-              end
+            next unless result = source_check.detect(self) rescue nil
+            if key_ = normalize_key(result.key)
+              key_source_ = result.to_s
+              return key_, key_source_
             end
           end
           nil
@@ -51,8 +50,6 @@ module Sym
             rescue
               nil
             end
-          else
-            nil
           end
         end
       end

data/lib/sym/application.rb

@@ -32,7 +32,6 @@ module Sym
                   :stdin, :stdout, :stderr, :kernel
 
     def initialize(opts, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = nil)
-
       self.stdin  = stdin
       self.stdout = stdout
       self.stderr = stderr
@@ -111,16 +110,12 @@ module Sym
     end
 
     def editor
-      editors_to_try.find { |editor| File.exist?(editor) }
+      editors_to_try.compact.find { |editor| File.exist?(editor) }
     end
 
     def process_output(result)
-      unless result.is_a?(Hash)
-        self.output.call(result)
-        result
-      else
-        result
-      end
+      self.output.call(result) unless result.is_a?(Hash)
+      result
     end
 
     private
@@ -182,7 +177,7 @@ module Sym
       args[:verbose]  = opts[:verbose]
       args[:provider] = opts[:cache_provider] if opts[:cache_provider]
 
-      self.password_cache = Sym::App::Password::Cache.instance.configure(args)
+      self.password_cache = Sym::App::Password::Cache.instance.configure(**args)
     end
 
     def process_edit_option
@@ -207,7 +202,7 @@ module Sym
     end
 
     def initialize_action
-      self.action = if opts[:encrypt] then
+      self.action = if opts[:encrypt]
                       :encr
                     elsif opts[:decrypt]
                       :decr
@@ -217,7 +212,7 @@ module Sym
     # If we are encrypting or decrypting, and no data has been provided, check if we
     # should read from STDIN
     def initialize_data_source
-      if self.action && opts[:string].nil? && opts[:file].nil? && !(self.stdin.tty?)
+      if self.action && opts[:string].nil? && opts[:file].nil? && !self.stdin.tty?
         opts[:file] = '-'
       end
     end