jefferies_tube 1.5 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d8559f8d9ea14fa4e3fadba12b86c710fa6466f69dedcb076f3baff26dfd2af
-  data.tar.gz: 6efef12d39e44e3dd174e3cd2ada93aeac7ec577092176cbff29034e9c92cdc0
+  metadata.gz: 8ddb970be7c5d3d44e2df2171455ce27685435dd61330cb692002097271496d1
+  data.tar.gz: 6b8a796088c566761a11a8b1f2ec5214884eed1d9c51159d0aca7f11a55b872d
 SHA512:
-  metadata.gz: 927415fb43ab50e81c33fba7ffcc9d876c1c6510883beb81848f91b141992026f1279d75979dc6c5175acfc37f4b30473d83342b2dced716d4b4261c70f1fa41
-  data.tar.gz: 931b995f90b0c43cab247ef7346fa3c0422a9f3be9944ff611838c6dfd4ea1653584a84d8716a098d029605cccac2c7d80946e9064df9869ecda28c4601c3f18
+  metadata.gz: fa431cb07c4d1abf50390ac2e65879c1e6a8cb57dfa711bc02f46ba389d7e7d58631faebb217c5ca919db5136d63e0ba0ae0ff115f90760ae46cc4f0c0243fb4
+  data.tar.gz: 313293998aaaecaf4e0d94f0c1437ae50f3369ee8a3db6d2220a8cc7c0aeb80040bf38bf5aeb055e5530ea5fa2ba2b40443b399138671238f5161da6d039cd20

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+3.1.0

data/CHANGELOG.md

@@ -6,6 +6,10 @@ This project attempts to follow [semantic versioning](https://semver.org/)
 
 ## Unreleased
 
+## 1.5.4
+  Fix a bug in the prompt if Pry is present.
+## 1.5.3
+  * Minor tweaks to the IRB console when sshing.  Don't use JT IRB locally
 ## 1.5
 
 * enhancements

data/README.md

@@ -51,43 +51,47 @@ require 'jefferies_tube/capistrano'
 
 #### Tasks
 
-* `cap beta ssh`
+* `cap dev ssh`
 
 Open ssh session in `current` directory.
 
-* `cap beta rails:console`
+* `cap dev rails:console`
 
 Open rails console.
 
-* `cap beta rails:dbconsole`
+* `cap dev rails:dbconsole`
 
 Open database console.
 
-* `cap beta rails:log`
+* `cap dev rails:log`
 
-Open log file. Can specify log file like so: `LOG=foobar cap beta rails:log`
+Open log file. Can specify log file like so: `LOG=foobar cap dev rails:log`
 
-* `cap beta rails:allthelogs`
+* `cap dev rails:allthelogs`
 
-Open the logfile for all servers (has the role :app) combined. Can specify log file like so: `LOG=foobar cap beta rails:allthelogs`
+Open the logfile for all servers (has the role :app) combined. Can specify log file like so: `LOG=foobar cap dev rails:allthelogs`
 
-* `cap beta db:backup`
+* `cap dev rails:rake[task:name]`
+
+Run the given rake task.
+
+* `cap dev db:backup`
 
 Make a database backup.
 
-* `cap beta db:fetch`
+* `cap dev db:fetch`
 
 Fetches the latest database backup. Useful for getting production data locally.
 
-* `cap beta db:restore FILE=path/to/backup.dump`
+* `cap dev db:restore FILE=path/to/backup.dump`
 
 Nuke the server's database with one you give it. Don't do this on production for obvious reasons. Useful for putting a backup fetched from production onto a dev server.
 
-* `cap beta deploy:ensure_tag`
+* `cap dev deploy:ensure_tag`
 
 Yells at you if there is not a tag for your code.
 
-* `cap beta deploy:create_tag`
+* `cap dev deploy:create_tag`
 
 Creates a tag for your code and pushes it.
 

data/jefferies_tube.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", '~> 3.0'
 
-  spec.add_dependency "bundler-audit", '~> 0.7.0'
+  spec.add_dependency "bundler-audit", '~> 0.9.0'
   spec.add_dependency "pry", '~> 0.13'
 end

data/lib/jefferies_tube/capistrano/deploy.rb

@@ -34,9 +34,9 @@ namespace :deploy do
     scanner.scan(ignore: ignore) do |result|
       vulnerable = true
       case result
-      when Bundler::Audit::Scanner::InsecureSource
+      when Bundler::Audit::Results::InsecureSource
         puts "Insecure Source URI found: #{result.source}"
-      when Bundler::Audit::Scanner::UnpatchedGem
+      when Bundler::Audit::Results::UnpatchedGem
         puts "#{result.gem} is not secure!"
       end
     end
@@ -51,4 +51,4 @@ namespace :deploy do
 end
 
 before 'deploy:migrate', 'deploy:backup_database'
-before 'deploy', 'deploy:scan_gems'
+before 'deploy', 'deploy:scan_gems'

data/lib/jefferies_tube/capistrano/rails.rb

@@ -3,7 +3,7 @@ namespace :rails do
   task :console do
     console_roles = [roles(:worker), roles(:app)].find(&:any?)
     on console_roles, primary: true do |host, user|
-      run_interactively "RAILS_ENV=#{rails_env} bundle exec rails console"
+      run_interactively "RAILS_ENV=#{rails_env} JEFFERIES_TUBE_IRB=1 bundle exec rails console"
     end
   end
 

data/lib/jefferies_tube/console.rb

@@ -1,26 +1,32 @@
 class JefferiesTube::Console
-  def self.prompt
+  def self.prompt_base
     rails_env = JefferiesTube.configuration.environment
     if rails_env
       color = "\e[0m" #Default to white text on no background
       current_app = JefferiesTube.configuration.prompt_name
 
-      # shorten some common long environment names
       if rails_env == "development"
       elsif rails_env == "dev"
-        rails_env = "dev"
         color = "\e[0;37m\e[1;44m" #White on blue
       elsif ["test", "qa", "staging"].include? rails_env
         color = "\e[0;37m\e[1;43m" #White on yellow
       elsif rails_env == "production"
-        rails_env = "prod"
         color = "\e[0;37m\e[1;41m" #White on red
       end
 
       base = "#{color}#{current_app}(#{rails_env})\e[0m"
-      return "#{base}> "
+      return "#{base}"
     else
-      return "#{current_app}> "
+      return "#{current_app}"
     end
   end
+
+  def self.pry_prompts
+    [
+      # wait_proc
+      proc { prompt_base + " > " },
+      # incomplete_proc
+      proc { prompt_base + "*> "}
+    ]
+  end
 end

data/lib/jefferies_tube/custom_prompts.irbrc.rb

@@ -1,11 +1,15 @@
-prompt = JefferiesTube::Console.prompt
+prompt = JefferiesTube::Console.prompt_base
 
-IRB.conf[:PROMPT][:RAILS_ENV] = {
-    :PROMPT_I => prompt,
-    :PROMPT_N => prompt,
-    :PROMPT_S => nil,
-    :PROMPT_C => prompt.sub('> ', '>* '),
-    :RETURN => "=> %s\n"
+IRB.conf[:PROMPT][:JEFFERIES_TUBE] = {
+  :PROMPT_I => "#{prompt} > ",
+  :PROMPT_N => "#{prompt}%l> ",
+  :PROMPT_S => "#{prompt}%l> ",
+  :PROMPT_C => "#{prompt}*> ",
+  :RETURN => "  => %s\n"
 }
 
-IRB.conf[:PROMPT_MODE] = :RAILS_ENV
+if ENV["JEFFERIES_TUBE_IRB"]
+  IRB.conf[:USE_MULTILINE] = false
+  IRB.conf[:USE_AUTOCOMPLETE] = false
+  IRB.conf[:PROMPT_MODE] = :JEFFERIES_TUBE
+end

data/lib/jefferies_tube/railtie.rb

@@ -12,8 +12,9 @@ module JefferiesTube
 
       ARGV.push "-r", File.join(File.dirname(__FILE__),"custom_prompts.irbrc.rb")
 
+      require 'pry'
       if defined? Pry
-        Pry.prompt = Pry::Prompt.new(:jefferies_tube, '', Array.new(2) { proc { JefferiesTube::Console.prompt } })
+        Pry.prompt = Pry::Prompt.new(:jefferies_tube, 'Jefferies Tube custom prompt', JefferiesTube::Console.pry_prompts)
       end
     end
 

data/lib/jefferies_tube/version.rb

@@ -1,7 +1,7 @@
 require 'open-uri'
 
 module JefferiesTube
-  VERSION = "1.5"
+  VERSION = "1.5.4"
 
   def self.latest_rubygems_version
     JSON.parse(URI.parse("https://rubygems.org/api/v1/versions/jefferies_tube/latest.json").read)["version"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jefferies_tube
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: 1.5.4
 platform: ruby
 authors:
 - Brian Samson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Ten Forward Consulting useful tools.