nib 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcfc968d8ee13c4739cb42a5afeddd81d5c45f1b
-  data.tar.gz: 04db626c3a278a91cba59bfef4d2707875e326fd
+  metadata.gz: ebb0995546ce3958ff2a7421e5104fbe8c0ff2c4
+  data.tar.gz: 3dcef7fb5d744a7ce6c3cb7c21dfd5032b4c4b99
 SHA512:
-  metadata.gz: 74ac8b08e4f48246cb6b6fb401225309cb2369175f83f1e3f2c394c0cb427880bebbe1f2e9392e7dff7e022482ad3700d5898e10227581ea0558907dbea27e50
-  data.tar.gz: 26cceb3d695fb319555683fc00728714670c69cf3801f3d1bc9f4d7b7af3299b232a7367342451a1b8642a431a74884f68b189b18539a9743ed19913a74b2bde
+  metadata.gz: 9de1a488e77c341eb655c447ef65c95563a2bf63c24d6908e60a040e6dd295af78086be0d094b1dfbf1bde60633f981209f544a2bb9e768532e14caad58e593e
+  data.tar.gz: 3d335688fe79b27a8bc345a1aecfb07736fe0a7426556cb781ed3903f3cbf55891b2e3b4af5d1dd89a483546193af73fc6b74248ef43213582eb066fc1fe0d73

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.5.0

data/lib/nib.rb

@@ -8,6 +8,8 @@ require 'nib/options/parser'
 
 require 'nib/command'
 require 'nib/history'
+require 'nib/history/compose'
+require 'nib/history/config'
 require 'nib/check_for_update'
 require 'nib/unrecognized_help'
 require 'nib/code_climate'
@@ -24,11 +26,7 @@ module Nib
 
   module_function
 
-  def load_config(command, file_name)
-    File.read("#{GEM_ROOT}/config/commands/#{command}/#{file_name}")
-  end
-
   def load_default_config(command, file_name)
-    load_config(command, file_name)
+    File.read("#{GEM_ROOT}/config/commands/#{command}/#{file_name}")
   end
 end

data/lib/nib/code_climate.rb

@@ -1,5 +1,3 @@
-require 'tempfile'
-
 class Nib::CodeClimate
   include Nib::Command
 
@@ -12,24 +10,15 @@ class Nib::CodeClimate
 
   def script
     @script ||= <<-SCRIPT
-      docker-compose \
-        -f #{compose_file.path} \
-        run \
+      docker run \
+        --interactive \
+        --tty \
         --rm \
-        codeclimate \
-        #{command}
+        --env CODECLIMATE_CODE="$PWD" \
+        --volume "$PWD":/code \
+        --volume /var/run/docker.sock:/var/run/docker.sock \
+        --volume /tmp/cc:/tmp/cc \
+        codeclimate/codeclimate #{command || 'help'}
     SCRIPT
   end
-
-  private
-
-  def config
-    @config ||= Nib.load_config(:codeclimate, 'docker-compose.yml')
-  end
-
-  def compose_file
-    @compose_file ||= Tempfile.open('compose') do |file|
-      file.tap { |f| f.write(config) }
-    end
-  end
 end

data/lib/nib/command.rb

@@ -26,6 +26,7 @@ module Nib::Command
   def script
     @script ||= <<-SCRIPT
       docker-compose \
+        #{alternate_compose_file} \
         run \
         --rm \
         #{options} \
@@ -33,4 +34,6 @@ module Nib::Command
         #{command}
     SCRIPT
   end
+
+  def alternate_compose_file; end
 end

data/lib/nib/history.rb

@@ -1,10 +1,28 @@
-require 'fileutils'
-
 module Nib::History
+  PATH = '/usr/local/history'.freeze
+
+  def self.prepended(base)
+    base.instance_eval do
+      extend ClassMethods
+    end
+  end
+
+  module ClassMethods
+    def history_requires_command(value)
+      @history_requires_command = value
+    end
+
+    def history_requires_command?
+      @history_requires_command
+    end
+  end
+
   def command
+    return if self.class.history_requires_command? && @command.to_s.empty?
+
     <<-COMMAND
       /bin/sh -c \"
-        export HISTFILE=./tmp/shell_history
+        export HISTFILE=#{PATH}/shell_history
         cp #{irbrc.container_path} /root/.irbrc 2>/dev/null
         cp #{pryrc.container_path} /root/.pryrc 2>/dev/null
         #{super}
@@ -12,51 +30,21 @@ module Nib::History
     COMMAND
   end
 
+  def alternate_compose_file
+    "-f #{Compose.new.path}"
+  end
+
   def irbrc
     @irbrc ||= Config.new(
       :irbrc,
-      'IRB.conf[:HISTORY_FILE] = "#{Dir.pwd}/tmp/irb_history"'
+      "IRB.conf[:HISTORY_FILE] = '#{PATH}/irb_history'"
     )
   end
 
   def pryrc
     @pryrc ||= Config.new(
       :pryrc,
-      'Pry.config.history.file = "#{Dir.pwd}/tmp/irb_history"'
+      "Pry.config.history.file = '#{PATH}/irb_history'"
     )
   end
-
-  class Config
-    attr_reader :type, :history_command, :host_path
-
-    def initialize(type, history_command)
-      @type = type
-      @history_command = history_command
-      @host_path = "#{ENV['HOME']}/.#{type}"
-
-      FileUtils.mkdir_p './tmp'
-    end
-
-    def container_path
-      config_file.path
-    end
-
-    private
-
-    def config
-      if File.exist?(host_path)
-        File.read(host_path)
-      else
-        Nib.load_default_config(:shell, type)
-      end
-    end
-
-    def config_file
-      @config_file ||= File.open("./tmp/#{type}", 'w+') do |file|
-        file.write(config)
-        file.write(history_command + "\n")
-        file
-      end
-    end
-  end
 end

data/lib/nib/history/compose.rb

@@ -0,0 +1,95 @@
+require 'tempfile'
+require 'tmpdir'
+
+class Nib::History::Compose
+  attr_reader :dir, :volume_name
+
+  def initialize
+    @volume_name = 'nib_history'
+    @dir = "#{Dir.tmpdir}/#{Dir.pwd.split('/').last}"
+
+    FileUtils.mkdir_p(dir)
+  end
+
+  def path
+    file.path
+  end
+
+  def config
+    original_config
+      .merge('services' => services_config)
+      .merge('volumes' => volumes_config)
+  end
+
+  private
+
+  def original_config
+    @original_config ||= YAML.safe_load(`docker-compose config`)
+  end
+
+  def file
+    @file ||= Tempfile.open('compose', dir) do |compose|
+      compose.write(config.to_yaml)
+      compose
+    end
+  end
+
+  def services_config
+    Services.new(volume_name, original_config['services']).config
+  end
+
+  def volumes_config
+    Volumes.new(volume_name, original_config['volumes']).config
+  end
+
+  class Services
+    attr_reader :original_config, :volume_name
+
+    def initialize(volume_name, original_config)
+      @original_config = original_config
+      @volume_name = volume_name
+    end
+
+    def config
+      original_config.each_with_object({}) do |(name, definition), extended|
+        extended[name] = Service.new(volume_name, definition).config
+      end
+    end
+  end
+
+  class Service
+    attr_reader :original_config, :volume_name
+
+    def initialize(volume_name, original_config)
+      @original_config = original_config
+      @volume_name = volume_name
+    end
+
+    def config
+      original_config.merge('volumes' => volumes_config << history_config)
+    end
+
+    private
+
+    def volumes_config
+      original_config['volumes'] || []
+    end
+
+    def history_config
+      "#{volume_name}:#{Nib::History::PATH}"
+    end
+  end
+
+  class Volumes
+    attr_reader :original_config, :volume_name
+
+    def initialize(volume_name, original_config = nil)
+      @original_config = original_config || {}
+      @volume_name = volume_name
+    end
+
+    def config
+      original_config.merge(volume_name => nil)
+    end
+  end
+end

data/lib/nib/history/config.rb

@@ -0,0 +1,35 @@
+require 'fileutils'
+
+class Nib::History::Config
+  attr_reader :type, :history_command, :host_path
+
+  def initialize(type, history_command)
+    @type = type
+    @history_command = history_command
+    @host_path = "#{ENV['HOME']}/.#{type}"
+
+    FileUtils.mkdir_p './tmp'
+  end
+
+  def container_path
+    config_file.path
+  end
+
+  private
+
+  def config
+    if File.exist?(host_path)
+      File.read(host_path)
+    else
+      Nib.load_default_config(:shell, type)
+    end
+  end
+
+  def config_file
+    @config_file ||= File.open("./tmp/#{type}", 'w+') do |file|
+      file.write(config)
+      file.write(history_command + "\n")
+      file
+    end
+  end
+end

data/lib/nib/run.rb

@@ -1,4 +1,6 @@
 class Nib::Run
   include Nib::Command
   prepend Nib::History
+
+  history_requires_command true
 end

data/lib/nib/shell.rb

@@ -2,19 +2,16 @@ class Nib::Shell
   include Nib::Command
   prepend Nib::History
 
-  SCRIPT = <<-SH.freeze
-    if hash bash 2>/dev/null ; then
-      bash
-    elif hash ash 2>/dev/null ; then
-      ash
-    else
-      sh
-    fi
-  SH
-
   private
 
   def command
-    SCRIPT
+    conditions = %i(zsh bash ash).map do |shell|
+      "elif hash #{shell} 2>/dev/null ; then #{shell};"
+    end
+
+    conditions                                         # default conditions
+      .unshift('if [ -f bin/shell ]; then bin/shell;') # prepend bin/shell
+      .push('else sh; fi')                             # add else clause (`sh`)
+      .join("\n")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nib
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - John Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.6
 description: |2
       nib is a docker-compose wrapper geared towards Ruby/Rails development.
 email:
@@ -149,7 +149,6 @@ files:
 - VERSION
 - bin/nib
 - config/commands.json
-- config/commands/codeclimate/docker-compose.yml
 - config/commands/shell/irbrc
 - config/commands/shell/pryrc
 - config/options.yml
@@ -162,6 +161,8 @@ files:
 - lib/nib/debug.rb
 - lib/nib/exec.rb
 - lib/nib/history.rb
+- lib/nib/history/compose.rb
+- lib/nib/history/config.rb
 - lib/nib/options.rb
 - lib/nib/options/augmenter.rb
 - lib/nib/options/parser.rb

data/config/commands/codeclimate/docker-compose.yml

@@ -1,12 +0,0 @@
-version: '2'
-
-services:
-  codeclimate:
-    image: codeclimate/codeclimate
-    environment:
-      - CODECLIMATE_CODE=$PWD
-    volumes:
-      - $PWD:/code
-      - $PWD:$PWD
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /tmp/cc:/tmp/cc