cknife 1.3.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8e24f7e41e3ed98f6d61a0d360b26f096862b121
-  data.tar.gz: fa9e6591fa5c4ac455e161f8a0766c254fb3aa56
+SHA256:
+  metadata.gz: fdcff4a4d17b6e4f7c13f4d02cc0cc215076a0ad8074b9bf87bc411772262d4b
+  data.tar.gz: f93a80481e4032e069a63ae953114da26118df9696e990cf565a02efb77181c6
 SHA512:
-  metadata.gz: 8678596a96eeff55e41a21af3c1b6ac27ed1c5749451c839e33d9051041c507bd17668c548049fce8588126a26d3f9ad2789ebb2755cf267156fcc807481a255
-  data.tar.gz: 1510e3040a671d69d988f3cbfa7c0631f9ab68601b40d3aa1593bd1024995b70e4e39c677fea89ceaa172a35d5a8ada9124bb681606a0a5aaa802f6fb8635996
+  metadata.gz: b3ff2f0c86206b4abd5b1386fe153df515132e20d94bee75171db2a0bcaeec701c841345ec5d08de82e20a12824fc5921350a1fad48af9768bdbb9f39c715eef
+  data.tar.gz: fb31871c49220d49eb6a919886ffd40dc509d95ffccb7cb9db31538dcae16594f71ebfbbca1f664cbec149cf45ce3bba06c790407b3eb919dbdb2a1bd1af141a

data/.ruby-version

@@ -1 +1 @@
-2.4
+3.3.0

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem "rest-client", '>= 1.8.0', '~> 1'
-gem "nokogiri", '>= 1.8.2', '~> 1'
+gem "nokogiri", ">= 1.10.4", '~> 1'
 gem "i18n", '>= 0.6.6'
 gem "activesupport", '>= 4.2.9'
 gem "actionpack", '>= 4.2.9'
@@ -11,12 +11,13 @@ gem "builder", '~> 3.0'
 gem "fog-aws", '< 3.0'
 gem "unf", '>= 0.1', '~> 0'
 gem "daemons"
+gem 'loofah', '~> 2.2.3'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   # gem "cknife", :path => "." # this arguably makes it easier to test quickly, locally.
-  gem "bundler", "~> 1.0"
+  gem "bundler", "~> 2.0"
   gem "jeweler", "~> 2.1"
 end
 

data/Gemfile.lock

@@ -1,35 +1,35 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (4.2.10)
-      actionview (= 4.2.10)
-      activesupport (= 4.2.10)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.10)
-      activesupport (= 4.2.10)
+    actionpack (7.0.8.1)
+      actionview (= 7.0.8.1)
+      activesupport (= 7.0.8.1)
+      rack (~> 2.0, >= 2.2.4)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (7.0.8.1)
+      activesupport (= 7.0.8.1)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (4.2.10)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (7.0.8.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
     addressable (2.4.0)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    crass (1.0.4)
-    daemons (1.2.3)
+    base64 (0.2.0)
+    builder (3.2.4)
+    concurrent-ruby (1.2.3)
+    crass (1.0.6)
+    daemons (1.4.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    domain_name (0.5.20180417)
-      unf (>= 0.0.5, < 1.0.0)
-    erubis (2.7.0)
-    excon (0.62.0)
+    domain_name (0.6.20240107)
+    erubi (1.12.0)
+    excon (0.110.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     fog-aws (2.0.1)
@@ -44,11 +44,12 @@ GEM
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-xml (0.1.3)
+    fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (0.2.5)
-    git (1.5.0)
+    formatador (0.3.0)
+    git (1.11.0)
+      rchardet (~> 1.8)
     github_api (0.16.0)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
@@ -56,11 +57,11 @@ GEM
       hashie (>= 3.4)
       mime-types (>= 1.16, < 3.0)
       oauth2 (~> 1.0)
-    hashie (3.6.0)
-    highline (2.0.0)
-    http-cookie (1.0.3)
+    hashie (5.0.0)
+    highline (3.0.1)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
-    i18n (0.9.5)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     ipaddress (0.8.3)
     jeweler (2.3.9)
@@ -74,76 +75,95 @@ GEM
       rake
       rdoc
       semver2
-    jwt (1.5.6)
-    loofah (2.2.2)
+    jwt (2.8.1)
+      base64
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.5.5)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
+    minitest (5.22.3)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
+    multipart-post (2.4.0)
     netrc (0.11.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    nokogiri (1.16.3-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.3-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.3-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.3-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.3-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.3-x86_64-linux)
+      racc (~> 1.4)
+    oauth2 (1.4.8)
+      faraday (>= 0.8, < 3.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
     polyglot (0.3.5)
-    psych (3.0.2)
-    rack (1.6.10)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.4)
+    psych (5.1.2)
+      stringio
+    racc (1.7.3)
+    rack (2.2.9)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
-    rake (12.3.1)
-    rdoc (6.0.4)
+    rake (13.2.1)
+    rchardet (1.8.0)
+    rdoc (6.6.3.1)
+      psych (>= 4.0.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     semver2 (3.4.2)
-    thor (0.20.0)
+    stringio (3.1.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unf (0.1.3)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unf (0.1.4)
       unf_ext
-    unf_ext (0.0.6)
+    unf_ext (0.0.9.1)
 
 PLATFORMS
-  ruby
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
+  x86_64-linux
 
 DEPENDENCIES
   actionpack (>= 4.2.9)
   activesupport (>= 4.2.9)
   builder (~> 3.0)
-  bundler (~> 1.0)
+  bundler (~> 2.0)
   daemons
   fog-aws (< 3.0)
   i18n (>= 0.6.6)
   jeweler (~> 2.1)
+  loofah (~> 2.2.3)
   mail (~> 2.5.5)
-  nokogiri (~> 1, >= 1.8.2)
+  nokogiri (~> 1, >= 1.10.4)
   rest-client (~> 1, >= 1.8.0)
   thor (~> 0, >= 0.14)
   unf (~> 0, >= 0.1)
 
 BUNDLED WITH
-   1.16.5
+   2.5.6

data/README.md

@@ -1,4 +1,6 @@
 
+[![Gem Version](https://badge.fury.io/rb/cknife.svg)](https://badge.fury.io/rb/cknife)
+
 # Quickstart
 
 cknife is a set of command line tools. They...do different things.
@@ -21,66 +23,13 @@ named `your-bucket-name`.
 
     > cknifeaws afew my-bucket --count=50
     
-That will show you 50 of them.
-
-# Why bother?
-
-What do you do when you don't want to write
-[bash](https://www.tldp.org/LDP/Bash-Beginners-Guide/html/Bash-Beginners-Guide.html),
-your `.bash_profile` already has more aliases than you can manage, and
-yet you still find it silly to be going to the same [old documentation
-websites](https://www.postgresql.org/docs/9.5/static/backup-dump.html)
-for things you are certain you once knew how to do?
-
-Well, you can write a script in something other than
-bash to automate the precise command line invocation
-that you used to accomplish a task. But when you
-move to a different project, how can you take your
-scripts with you? Why not design your scripts
-to be robust enough so that they are conventional?
-
-Why can't a [Stackoverflow](https://stackoverflow.com) question's
-answer be captured in a form that can be configured and called by you
-(or someone who was in your position before), so that you don't have
-to enter the same question into
-[google.com](https://www.google.com/?q=LOL%20HALP%20ME%20CODE) again
-later down the road?
-
-Why make a browser bookmark if you can skip the browser entirely?
-It's not like the browser bookmark can compile the answer into machine
-code for you, anyway.
-
-If someone turns the answer into a programmed tool, what if your IDE
-is no better than the command line when it comes to invoking it?
-
-I created cknife to have a set of scripts to fall back on when
-confronted with the above encounter I've been having for years. cknife
-is a toolset that encapsulates common command line expressions that
-developers use when at work.
-
-I've never used [chef](https://www.chef.io), but were I to grow
-cknife, I wouldn't be surprised to see it overlap with it.
-
-cknife currently has some wrappers around Amazon's EC2 and S3
-services. It has others around MySQL and PostgreSQL. It has a trivial
-one around [du](http://man7.org/linux/man-pages/man1/du.1.html).  The
-`cknifemon` tool, meanwhile, is a daemon that can launch PUT HTTP
-requests to an endpoint you configure, on a schedule.
-
-It can be used for system administration, but it can be also be used
-to aid developers as they acclimate themselves to a piece of
-technology with which they may not be familiar, and for which
-documentation may be a little scattered. It can be used
-to bang on a piece of technology for the sake of your own
-learning, too.
-
-To be precise, cknife consists of command line executables. These
-tools often require more information from the user, which can be put
-into a configuration file, `cknife.yml`, in YAML format, and found by
-cknife in the current working directory ($CWD) when it is invoked.
-
-See the [Wiki](https://github.com/mikedll/cknife/wiki) for
-details on the tools cknife has.
+That will show you 50 of them. You can see the help for this command, too.
+
+    > cknifeaws help
+
+See the
+[Wiki](https://github.com/mikedll/cknife/wiki) for details on the
+tools cknife has. A complete list of the tools is below under 'usage'.
 
 # Requirements
 
@@ -118,14 +67,14 @@ these two places, in order:
 
 Here are the command line executables:
 
-  - cknifeaws
-  - cknifedub
-  - cknifemail  
-  - cknifemon
-  - cknifemysql
-  - cknifenowtimestamp
-  - cknifepg
-  - cknifewcdir
+  - cknifeaws - AWS wrappers.
+  - cknifemail - SMTP email sender.
+  - cknifemon - Daemon that sends heartbeat signals to a place of your choosing.
+  - cknifemysql - MySQL utilities.
+  - cknifepg - PostgreSQL utilities.
+  - cknifewcdir - Lines-of-code calculator.
+  - cknifedub - Spot directories that are particularly space-consuming.
+  - cknifenowtimestamp - Get a now() timestamp string.
 
 You can invoke any of them like this:
 

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.2

data/bin/cknifewcdir

@@ -31,7 +31,7 @@ class CKnifeWcdir < Thor
   def count(*patterns)
     start_point = options[:start].empty? ? "." : options[:start].chomp('/')
 
-    pattern_s = "\\( " + patterns.map { |p| "-name #{p}" }.join(' -o ') + " \\) "
+    pattern_s = "\\( " + patterns.map { |p| "-name '#{p}'" }.join(' -or ') + " \\) "
     skip_s = options[:skip].empty? ? "" : "-type d \\( " + options[:skip].map { |dir| "-path #{start_point}/#{dir.chomp('/')}" }.join(' -o ') +  " \\) -prune -o "
 
     # note patterns must go after the skips (after the -prune -o)

data/cknife.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: cknife 1.3.0 ruby lib
+# stub: cknife 1.4.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "cknife".freeze
-  s.version = "1.3.0"
+  s.version = "1.4.2".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Michael Rivera".freeze]
-  s.date = "2018-10-10"
+  s.date = "2024-04-10"
   s.description = "A collection of command line tools, especially for popular API services.".freeze
   s.email = "soymrmike@gmail.com".freeze
   s.executables = ["cknifeaws".freeze, "cknifedub".freeze, "cknifemail".freeze, "cknifemon".freeze, "cknifemysql".freeze, "cknifenowtimestamp".freeze, "cknifepg".freeze, "cknifewcdir".freeze]
@@ -51,55 +51,24 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/mikedll/cknife".freeze
   s.licenses = ["".freeze]
-  s.rubygems_version = "2.6.14.1".freeze
+  s.rubygems_version = "3.5.3".freeze
   s.summary = "CKnife".freeze
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  s.specification_version = 4
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>.freeze, [">= 1.8.0", "~> 1"])
-      s.add_runtime_dependency(%q<nokogiri>.freeze, [">= 1.8.2", "~> 1"])
-      s.add_runtime_dependency(%q<i18n>.freeze, [">= 0.6.6"])
-      s.add_runtime_dependency(%q<activesupport>.freeze, [">= 4.2.9"])
-      s.add_runtime_dependency(%q<actionpack>.freeze, [">= 4.2.9"])
-      s.add_runtime_dependency(%q<mail>.freeze, ["~> 2.5.5"])
-      s.add_runtime_dependency(%q<thor>.freeze, [">= 0.14", "~> 0"])
-      s.add_runtime_dependency(%q<builder>.freeze, ["~> 3.0"])
-      s.add_runtime_dependency(%q<fog-aws>.freeze, ["< 3.0"])
-      s.add_runtime_dependency(%q<unf>.freeze, [">= 0.1", "~> 0"])
-      s.add_runtime_dependency(%q<daemons>.freeze, [">= 0"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.1"])
-    else
-      s.add_dependency(%q<rest-client>.freeze, [">= 1.8.0", "~> 1"])
-      s.add_dependency(%q<nokogiri>.freeze, [">= 1.8.2", "~> 1"])
-      s.add_dependency(%q<i18n>.freeze, [">= 0.6.6"])
-      s.add_dependency(%q<activesupport>.freeze, [">= 4.2.9"])
-      s.add_dependency(%q<actionpack>.freeze, [">= 4.2.9"])
-      s.add_dependency(%q<mail>.freeze, ["~> 2.5.5"])
-      s.add_dependency(%q<thor>.freeze, [">= 0.14", "~> 0"])
-      s.add_dependency(%q<builder>.freeze, ["~> 3.0"])
-      s.add_dependency(%q<fog-aws>.freeze, ["< 3.0"])
-      s.add_dependency(%q<unf>.freeze, [">= 0.1", "~> 0"])
-      s.add_dependency(%q<daemons>.freeze, [">= 0"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>.freeze, ["~> 2.1"])
-    end
-  else
-    s.add_dependency(%q<rest-client>.freeze, [">= 1.8.0", "~> 1"])
-    s.add_dependency(%q<nokogiri>.freeze, [">= 1.8.2", "~> 1"])
-    s.add_dependency(%q<i18n>.freeze, [">= 0.6.6"])
-    s.add_dependency(%q<activesupport>.freeze, [">= 4.2.9"])
-    s.add_dependency(%q<actionpack>.freeze, [">= 4.2.9"])
-    s.add_dependency(%q<mail>.freeze, ["~> 2.5.5"])
-    s.add_dependency(%q<thor>.freeze, [">= 0.14", "~> 0"])
-    s.add_dependency(%q<builder>.freeze, ["~> 3.0"])
-    s.add_dependency(%q<fog-aws>.freeze, ["< 3.0"])
-    s.add_dependency(%q<unf>.freeze, [">= 0.1", "~> 0"])
-    s.add_dependency(%q<daemons>.freeze, [">= 0"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>.freeze, ["~> 2.1"])
-  end
+  s.add_runtime_dependency(%q<rest-client>.freeze, [">= 1.8.0".freeze, "~> 1".freeze])
+  s.add_runtime_dependency(%q<nokogiri>.freeze, [">= 1.10.4".freeze, "~> 1".freeze])
+  s.add_runtime_dependency(%q<i18n>.freeze, [">= 0.6.6".freeze])
+  s.add_runtime_dependency(%q<activesupport>.freeze, [">= 4.2.9".freeze])
+  s.add_runtime_dependency(%q<actionpack>.freeze, [">= 4.2.9".freeze])
+  s.add_runtime_dependency(%q<mail>.freeze, ["~> 2.5.5".freeze])
+  s.add_runtime_dependency(%q<thor>.freeze, [">= 0.14".freeze, "~> 0".freeze])
+  s.add_runtime_dependency(%q<builder>.freeze, ["~> 3.0".freeze])
+  s.add_runtime_dependency(%q<fog-aws>.freeze, ["< 3.0".freeze])
+  s.add_runtime_dependency(%q<unf>.freeze, [">= 0.1".freeze, "~> 0".freeze])
+  s.add_runtime_dependency(%q<daemons>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<loofah>.freeze, ["~> 2.2.3".freeze])
+  s.add_development_dependency(%q<bundler>.freeze, ["~> 2.0".freeze])
+  s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.1".freeze])
 end
 

data/lib/cknife/cknife_mysql.rb

@@ -6,6 +6,8 @@ require 'cknife/command_line'
 module CKnife
   class CKnifeMysql < Thor
 
+    class_option :verbose, :default => false, :type => :boolean, :desc => "Show which commands are invoked, any input given to them, and any output they give back."
+
     no_tasks do
       def config
         @config ||= Config
@@ -30,8 +32,38 @@ module CKnife
       end
 
       def command_line
-        @command_line ||= CommandLine.new(option_file, "[client]\npassword=\"#{conf[:password]}\"", self)
+        @command_line ||= CommandLine.new(option_file, "[client]\npassword=\"#{conf[:password]}\"", self, options)
+      end
+
+      def mysql_easy
+        "mysql #{connection_options} #{conf[:database]}"
+      end
+    end
+
+    desc "console", "Launch mysql console."
+    method_option :myfile, :type => :boolean, :default => false, :desc => "Write my.cnf file if it doesn't exist."
+    def console
+      if !File.exists?(option_file)
+        if !options[:myfile]
+          say("You must prepare a #{option_file} file for this command, or use --myfile to have this tool create it for you. Alternatively, you can create a #{option_file} file with the myfile command and delete it later with the dmyfile command.")
+          return
+        end
+
+        command_line.write_option_file
       end
+
+      dc(mysql_easy) if options[:verbose]
+      exec(mysql_easy)
+    end
+
+    desc "myfile", "Write a my.cnf file in $CWD. Useful for starting a mysql session on your own."
+    def myfile
+      command_line.create_opt_file("Connect command: #{mysql_easy}")
+    end
+
+    desc "dmyfile", "Delete the my.cnf file in $CWD, assuming it exactly matches what would be generated by this tool."
+    def dmyfile
+      command_line.delete_opt_file
     end
 
     desc "capture", "Capture a dump of the database to db(current timestamp).sql."

data/lib/cknife/cknife_pg.rb

@@ -36,6 +36,7 @@ class CKnifePg < Thor
       @pg_pass_file = ".pgpass"
     end
 
+    # dump command?
     def dc(cmd)
       puts "PGPASSFILE=#{pg_pass_file} #{cmd}"
     end
@@ -304,7 +305,7 @@ AND
       return
     end
 
-    f = write_pg_pass_file
+    write_pg_pass_file
     say("Wrote #{pg_pass_file} to $CWD.")
     say(connect_msg)
     say("Remember to delete the .pgpass file when you are finished.")

data/lib/cknife/command_line.rb

@@ -1,31 +1,76 @@
 module CKnife
   class CommandLine
 
-    attr_accessor :option_file, :option_file_contents, :thor_output
+    attr_accessor :option_file, :option_file_contents, :thor_output, :options
 
-    def initialize(f, s, o)
+    def initialize(f, s, o, opts)
       self.option_file = f
       self.option_file_contents = s
       self.thor_output = o
+      self.options = opts
+    end
+
+    # dump command?
+    def dc(cmd)
+      puts "PGPASSFILE=#{pg_pass_file} #{cmd}"
+    end
+
+    def write_option_file
+      File.open(option_file, "w", 0600) { |f| f.write option_file_contents }
+    end
+
+    def delete_opt_file
+      if !File.exists?(option_file)
+        thor_output.say("No #{option_file} file to delete.")
+        return
+      end
+
+      s = File.read(option_file)
+      if s == option_file_contents
+        File.unlink(option_file)
+        thor_output.say("Deleted #{option_file} file.")
+      else
+        thor_output.say("The #{option_file} file's contents do not match what this tool would have generated. Assuming you are trying to delete a #{option_file} file that this tool did not generate, please inspect the file to ensure it contains what you expect, and then delete it yourself.", :red)
+      end
+    end
+
+    def create_opt_file(connect_msg)
+      if File.exists?(option_file)
+        thor_output.say("A #{option_file} file is already present.")
+        thor_output.say(connect_msg)
+        return
+      end
+
+      write_option_file
+      thor_output.say("Wrote #{option_file} to $CWD.")
+      thor_output.say(connect_msg)
+      thor_output.say("Remember to delete the #{option_file} file when you are finished.")
     end
 
     def execute(cmd, input = nil)
       return if !@session_ok
-      puts cmd
+      dc(cmd) if options[:verbose]
       stdin, stdout, stderr, wait_thread = Open3.popen3(cmd)
       if input
-        puts input
+        puts input if options[:verbose]
         stdin.write input
         stdin.close
       end
       output = stdout.read
       output += stderr.read
-      $stdout.write output
+      $stdout.write output if options[:verbose]
       stdout.close
       stderr.close
       result = wait_thread.value.to_i
-      @session_ok = @session_ok && (result == 0)
-      yield if @session_ok && block_given?
+
+      if result != 0
+        @session_ok = false
+        msg = "An error occurred."
+        msg += " If the --verbose flag is available for this command, you may try turning it on." if !options[:verbose]
+        thor_output.say(msg, :red)
+      end
+
+      yield if block_given?
       output
     end
 
@@ -37,24 +82,33 @@ module CKnife
       @session_live = true
       @session_ok = true
 
+      existing_option_file = false
       if File.exists?(option_file)
-        thor_output.say("This generates a file named #{option_file}, but one is already on disk. Exiting.")
-        return
+        existing_option_file = true
+        s = File.read(option_file)
+        if s != option_file_contents
+          thor_output.say("A #{option_file} file is present, but it does not match your database configuration. The contents of the #{option_file} file must exactly match what this tool would generate. Please reconcile the #{option_file} file with your configuration, and then try again. You can also delete the #{option_file} file since this tool generates one in order to do its job (and removes it after finishing).", :red)
+          return
+        end
       end
 
-      File.open(option_file, "w", 0600) { |f| f.write option_file_contents }
-
-      result = yield self
+      write_option_file
 
-      FileUtils.rm(option_file)
-      if File.exists?(option_file)
-        thor_output.say("Failed to remove #{option_file} file. Please remove it for security purposes.")
+      result = nil
+      begin
+        result = yield self # don't know what we're planning to do with the result here...
+      ensure
+        if !existing_option_file
+          FileUtils.rm(option_file)
+          if File.exists?(option_file)
+            thor_output.say("Failed to remove #{option_file} file. Please remove it for your infrastructure's security.")
+          end
+        else
+          thor_output.say("Left existing #{option_file} file on disk.", :yellow)
+        end
       end
 
-      thor_output.say
-      thor_output.say("Command failed.", :red) if !@session_ok
       @session_live = false
-
       result
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cknife
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Michael Rivera
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-10 00:00:00.000000000 Z
+date: 2024-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.10.4
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.2
+        version: 1.10.4
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
@@ -188,20 +188,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: loofah
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -264,7 +278,7 @@ homepage: http://github.com/mikedll/cknife
 licenses:
 - ''
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -279,9 +293,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: CKnife
 test_files: []