nib 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2df2eeac6e678d790c68a32cb929ad5942e4f202
-  data.tar.gz: 766215d7e95c7f6c0b86e46de8088a013de080b3
+  metadata.gz: a2d0d457ee0bdd2654793fd043122a1e2dfebce5
+  data.tar.gz: 086c7ac0a6e0bbf12cbd6b6abdc0e866a46fb80d
 SHA512:
-  metadata.gz: b495773e74bb803520ed52d1342b585c14e87f1081777b21ba6a89daeda9084397061b8c3291cd11fbdf8ea68978970db58384cae0781f22853a3f8684fe956d
-  data.tar.gz: 816c4025ff4af3a5bcd8514b907c5c9c8519ed5f6ceeb758f3fd5fe24d40353950638b2428f101a37720f029bc952a7702a2764c84070f8e65fe91684001c810
+  metadata.gz: f79e0312ce728a86b455be93175cb2918f4bdb725e17391d1dac273b19ac3e58b9c667fe88f7be6f662cf70f8b193d9b4bc70850eef580aede59754116227d2b
+  data.tar.gz: 6e6c6345b2dd972350005ec6a935dd31c95e08f651e2872c502d54e10b780bf9b181652e7b48116f82c765555e23f613e830075e154dcbf8af075c5e812ca37f

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.4.0

data/bin/nib

@@ -150,7 +150,7 @@ arg :service
 arg :command, %i(optional multiple)
 command :rubocop do |c|
   c.action do |global, options, args|
-    Nib::Run.execute(args.insert(1, :rubocop), '--no-deps')
+    Nib::Run.execute(args.insert(1, :"rubocop -D"), '--no-deps')
   end
 end
 
@@ -161,12 +161,15 @@ command :run do |c|
   Nib::Options::Augmenter.augment(c)
 
   c.action do |global, options, args|
+    # work around an `OptionParser` limitation: https://git.io/vDKrh
+    options[:'no-deps'] = options['no-deps'] = ARGV.include?('--no-deps')
+
     Nib::Run.execute(args, Nib::Options::Parser.parse(options))
   end
 end
 
 desc 'Runs application specific setup for the given service'
-long_desc 'By default the setup command will execute \'bundle install && rake db:create db:migrate\'.
+long_desc 'By default the setup command will execute \'gem install bundler && bundle install\'.
 
 This behavior can be overriden by providing an executable file in the project at $pwd/bin/setup.
 Additionally the setup process can be augmented by providing either $pwd/bin/setup.before or

data/config/commands.json

@@ -91,7 +91,7 @@
     "name": "setup",
     "type": "custom",
     "short_description": "Runs application specific setup for the given service",
-    "long_description": "By default the setup command will execute 'bundle install && rake db:create db:migrate'.\n\nThis behavior can be overriden by providing an executable file in the project at $pwd/bin/setup.\nAdditionally the setup process can be augmented by providing either $pwd/bin/setup.before or\n$pwd/bin/setup.after. This allows for extending the default behavior without having to redefine it.",
+    "long_description": "By default the setup command will execute 'gem install bundler && bundle install'.\n\nThis behavior can be overriden by providing an executable file in the project at $pwd/bin/setup.\nAdditionally the setup process can be augmented by providing either $pwd/bin/setup.before or\n$pwd/bin/setup.after. This allows for extending the default behavior without having to redefine it.",
     "options": []
   },
   {

data/lib/nib.rb

@@ -7,6 +7,7 @@ require 'nib/options/augmenter'
 require 'nib/options/parser'
 
 require 'nib/command'
+require 'nib/history'
 require 'nib/check_for_update'
 require 'nib/unrecognized_help'
 require 'nib/code_climate'

data/lib/nib/console.rb

@@ -1,24 +1,8 @@
 class Nib::Console
   include Nib::Command
-
-  IRBRC = <<~'IRB'.freeze
-    require \"rubygems\"
-    require \"irb/completion\"
-    require \"irb/ext/save-history\"
-    # irb configuration
-    IRB.conf[:PROMPT_MODE] = :SIMPLE
-    IRB.conf[:AUTO_INDENT] = true
-    # irb history
-    IRB.conf[:EVAL_HISTORY] = 10
-    IRB.conf[:SAVE_HISTORY] = 1000
-    IRB.conf[:HISTORY_FILE] = \"#{Dir.pwd}/tmp/irb_history\"
-  IRB
-
-  PRYRC = 'Pry.config.history.file = \"#{Dir.pwd}/tmp/irb_history\"'.freeze
+  prepend Nib::History
 
   SCRIPT = <<~SH.freeze
-    echo '#{IRBRC}' > /root/.irbrc
-    echo '#{PRYRC}' > /root/.pryrc
     has_pry=false
     has_boot=false
     if hash pry 2>/dev/null ; then
@@ -43,25 +27,9 @@ class Nib::Console
     fi
   SH
 
-  def execute
-    system('mkdir', '-p', './tmp')
-    super
-  end
-
-  def script
-    @script ||= <<~SCRIPT
-      docker-compose \
-        run \
-        --rm \
-        -e HISTFILE=./tmp/shell_history \
-        #{service} \
-        #{command}
-    SCRIPT
-  end
-
   private
 
   def command
-    "/bin/sh -c \"#{SCRIPT}\""
+    SCRIPT
   end
 end

data/lib/nib/exec.rb

@@ -1,5 +1,6 @@
 class Nib::Exec
   include Nib::Command
+  prepend Nib::History
 
   def script
     @script ||= <<~SCRIPT
@@ -7,15 +8,15 @@ class Nib::Exec
         exec \
         #{options} \
         #{service} \
-        /bin/sh -c "#{entrypoint}"
+        #{command}
     SCRIPT
   end
 
   def action
-    command.to_s.empty? ? '' : "-c '#{command}'"
+    @command.to_s.empty? ? '' : "-c '#{@command}'"
   end
 
-  def entrypoint
+  def command
     "
       if hash bash 2>/dev/null ; then
         bash #{action}

data/lib/nib/history.rb

@@ -0,0 +1,32 @@
+module Nib::History
+  IRBRC = <<~'IRB'.freeze
+    require \"rubygems\"
+    require \"irb/completion\"
+    require \"irb/ext/save-history\"
+    # irb configuration
+    IRB.conf[:PROMPT_MODE] = :SIMPLE
+    IRB.conf[:AUTO_INDENT] = true
+    # irb history
+    IRB.conf[:EVAL_HISTORY] = 10
+    IRB.conf[:SAVE_HISTORY] = 1000
+    IRB.conf[:HISTORY_FILE] = \"#{Dir.pwd}/tmp/irb_history\"
+  IRB
+
+  PRYRC = 'Pry.config.history.file = \"#{Dir.pwd}/tmp/irb_history\"'.freeze
+
+  def execute
+    system('mkdir', '-p', './tmp')
+    super
+  end
+
+  def command
+    <<~COMMAND
+      /bin/sh -c \"
+        export HISTFILE=./tmp/shell_history
+        echo '#{IRBRC}' > /root/.irbrc
+        echo '#{PRYRC}' > /root/.pryrc
+        #{super}
+      \"
+    COMMAND
+  end
+end

data/lib/nib/run.rb

@@ -1,3 +1,4 @@
 class Nib::Run
   include Nib::Command
+  prepend Nib::History
 end

data/lib/nib/shell.rb

@@ -1,5 +1,6 @@
 class Nib::Shell
   include Nib::Command
+  prepend Nib::History
 
   SCRIPT = <<~SH.freeze
     if hash bash 2>/dev/null ; then
@@ -11,25 +12,9 @@ class Nib::Shell
     fi
   SH
 
-  def execute
-    system('mkdir', '-p', './tmp')
-    super
-  end
-
-  def script
-    @script ||= <<~SCRIPT
-      docker-compose \
-        run \
-        --rm \
-        -e HISTFILE=./tmp/shell_history \
-        #{service} \
-        #{command}
-    SCRIPT
-  end
-
   private
 
   def command
-    "/bin/sh -c \"#{SCRIPT}\""
+    SCRIPT
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nib
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - John Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -110,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,6 +123,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 description: 'nib is a docker-compose wrapper geared towards Ruby/Rails development.
 
 '
@@ -146,6 +160,7 @@ files:
 - lib/nib/console.rb
 - lib/nib/debug.rb
 - lib/nib/exec.rb
+- lib/nib/history.rb
 - lib/nib/options.rb
 - lib/nib/options/augmenter.rb
 - lib/nib/options/parser.rb
@@ -174,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: The tip of the pen (compose)