jefferies_tube 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62abf29481a5ecce36e8f8dbd660b81dbe2977de464ecc7cfc74f448c5f8ff2c
-  data.tar.gz: 9c42932c67cd2c0c83c5a98e6953218f75b50791446a524fc28f5d12a1f79cd5
+  metadata.gz: 06d45e26cc3c3f6db3337acf9d656e02dd4afdad972aea8f1e298482805a1520
+  data.tar.gz: e8e8a23b284b5a03e65bc9c3a3d7df73fdee46573972353c1c34616b7d56dbd6
 SHA512:
-  metadata.gz: 28f1ff3cf8753d02182acb2c49752aae9040a55ecc89e63826cdf9be4bd1df8eaed69fdd48156442377f34885447024a4077a8bf4183f351578d69fa2035f966
-  data.tar.gz: 55a53583bfdd56eb0447a06bc83a2e101f11ff32837a8fbd826c687f991ece7b2dcae4a7197774b6481f20be7d5810225ab08bfdc50f5982e8066a1f80d8fcb3
+  metadata.gz: b485c95ad3b92bf78a32c54e1b70b3a38b09dec3d4314ba5e6b3f45e2f691dbad4df4e864ba4a880fefbe0d4229c70a5480f13fbd39727e4544353d340802932
+  data.tar.gz: b1e7081ebbf93d900d471e9ffdc2bce83f91eb8a941430e0939586dded1095a0e128149231d51da169fa2157e9522d6fea7ce0b5d4bec0d5f14ad8f86ef093bc

data/lib/jefferies_tube/console.rb

@@ -0,0 +1,26 @@
+class JefferiesTube::Console
+  def self.prompt
+    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}> "
+    else
+      return "#{current_app}> "
+    end
+  end
+end

data/lib/jefferies_tube/custom_prompts.irbrc.rb

@@ -1,31 +1,11 @@
-rails_env = JefferiesTube.configuration.environment
+prompt = JefferiesTube::Console.prompt
 
-if rails_env
-  color = "\e[0m" #Default to white text on no background
-  current_app = JefferiesTube.configuration.prompt_name
+IRB.conf[:PROMPT][:RAILS_ENV] = {
+    :PROMPT_I => prompt,
+    :PROMPT_N => prompt,
+    :PROMPT_S => nil,
+    :PROMPT_C => prompt.sub('> ', '>* '),
+    :RETURN => "=> %s\n"
+}
 
-  # shorten some common long environment names
-  if ["development", "dev"].include? rails_env
-    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"
-  prompt = base + "> "
-
-  IRB.conf[:PROMPT][:RAILS_ENV] = {   
-      :PROMPT_I => prompt,
-      :PROMPT_N => prompt,
-      :PROMPT_S => nil,
-      :PROMPT_C => base + ">* ",
-      :RETURN => "=> %s\n"
-  }
-
-  IRB.conf[:PROMPT_MODE] = :RAILS_ENV
-
-end
+IRB.conf[:PROMPT_MODE] = :RAILS_ENV

data/lib/jefferies_tube/railtie.rb

@@ -1,31 +1,20 @@
 require 'jefferies_tube'
+require 'jefferies_tube/console'
 require 'rails'
 
 module JefferiesTube
 
   class Railtie < ::Rails::Railtie
     railtie_name :jefferies_tube
-    
+
     console do
       ActiveRecord::Base.connection
-      unless defined? Pry
-        ARGV.push "-r", File.join(File.dirname(__FILE__),"custom_prompts.irbrc.rb")
-      end
-      
-      if defined? Pry        
+
+      ARGV.push "-r", File.join(File.dirname(__FILE__),"custom_prompts.irbrc.rb")
+
+      if defined? Pry
         Pry.config.prompt = proc {
-          current_app = JefferiesTube.configuration.prompt_name
-          rails_env = JefferiesTube.configuration.environment
-        
-          # shorten some common long environment names
-          if rails_env == "development"
-            rails_env = "dev"
-          elsif rails_env == "production"
-            rails_env = "prod"
-          end 
-        
-          base = "#{current_app}(#{rails_env})"
-          prompt = base + "> "
+          JefferiesTube::Console.prompt
         }
       end
     end
@@ -54,7 +43,6 @@ module JefferiesTube
       ActionView::Base.send :include, JefferiesTube::ApplicationHelper
     end
 
-
     initializer "fix spring + figaro" do |config|
       if defined?(Spring) && File.exists?("config/application.yml")
         require 'spring/watcher'

data/lib/jefferies_tube/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jefferies_tube
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brian Samson
@@ -142,6 +142,7 @@ files:
 - lib/jefferies_tube/capistrano/rails.rb
 - lib/jefferies_tube/capistrano/s3_assets.rb
 - lib/jefferies_tube/capistrano/ssh.rb
+- lib/jefferies_tube/console.rb
 - lib/jefferies_tube/custom_prompts.irbrc.rb
 - lib/jefferies_tube/database_backup.rb
 - lib/jefferies_tube/database_backup_adapter.rb