vader 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e03240a14c0f4c941b9a061c058d91320e765937
-  data.tar.gz: 3435b024b83438dc360c1939a6a4871a5a601af2
+  metadata.gz: 13c24e2f611edebc519b2427d99a7ce0ecd00582
+  data.tar.gz: ea1e2bb22acf892f780b206cfc23a3b0702c9658
 SHA512:
-  metadata.gz: 33309382526388905cb0f448e1c9f200f5d2b0d8a376a66b3ac0938711fae6e1ffdfd080b8a460e83d4c4c322c1d01ce71503153c4ff4e699da7f48c4f58c62f
-  data.tar.gz: 32abc280d0e053e1d702efd0d8a7caadeece0a2a2f6b46f15cbd9bf105e97722af55fea92260bdfe97dc96744a8c4f9377f514e2d7a4b85f594201f735c0bfdb
+  metadata.gz: 005ff69d1d163a009f574868112d1bd6f2fc88ec19d1f009b13273030589a0a66329c21272cde8f53c6b2976d377b5fa808d00256e2295b201430889b9c715e8
+  data.tar.gz: c1fb44ee10abbd3f80974392e99dd23df4e886b5c994f9ed45a9af4e48232ae08c7e60b5b4935a67efb96b27e2196ca28434f2dfbe54f069bf8f5e1632d5ce40

data/README.md

@@ -1,32 +1,50 @@
 # vader
-Vader: Apple Docker Environment for Rails
+Vader stands for *Vader: Apple Docker Environment for Rails*.
+
+## Installation
+
+Clone this repository and run `./install.sh`
+
+## Usage
+
+`vader up`
+
+## Troubleshooting
+
+Set `VADER_VERBOSE` to debug.
+
+To debug syncing issues, reinstall with verbose logging enabled.
+
+```
+VADER_VERBOSE=1 ./install.sh
+```
+
+Then watch the logs with:
+```
+tail -f ~/Library/Logs/Vader/*.log
+```
+
+
 
 ## Commands
 
 Install vader: `curl get.vader.codes | bash -e`
 
-`vader init` - configures current directory for vader
+`vader init` - (TODO) configures current directory for vader
 
 `vader sync` - starts rsync daemon, usually called by startup script
 
-`vader sync-back` - called after `rails g`, `bundle`
+`vader sync-back` - (TODO) called after `rails g`, `bundle`
 
 `vader exec ...`
 
 `vader up`
 
-`vader -v`
+`vader -v` (TODO)
 `vader help`
 
-# Config:
-`.vader.yml`:
-```
-min_version: 123 # Minimum required vader version
-exec_container: app
-```
-
+## Dependencies
 
-# NB: user gem install:
-```
-gem install --user-install --bindir /usr/local/bin vader-0.0.1.gem
-```
+- boot2docker (docker, VirtualBox)
+- docker-compose
+- Pow

data/lib/vader.rb

@@ -5,26 +5,29 @@ require 'rb-fsevent'
 
 class Vader
   autoload :VERSION, 'vader/version'
-  autoload :Sync,    'vader/sync'
   autoload :Exec,    'vader/exec'
+  autoload :Init,    'vader/init'
+  autoload :Setup,   'vader/setup'
+  autoload :Sync,    'vader/sync'
+  autoload :Up,      'vader/up'
+
+  autoload :DockerUtil, 'vader/docker_util'
+
+  COMMANDS = {
+    'exec'  => -> { Vader::Exec },
+    'init'  => -> { Vader::Init }, #TODO
+    'setup' => -> { Vader::Setup },
+    'sync'  => -> { Vader::Sync },
+    'up'    => -> { Vader::Up }
+  }
 
   def run
     check_version
 
-    case ARGV.shift
-    when 'sync'
-      Vader::Sync.new.run
-    when 'setup'
-      setup_path = File.expand_path('../libexec/setup', File.dirname(__FILE__))
-      exec setup_path
-    when 'init'
-      # Writeme
-      puts 'Not implemented yet. This will configure the current directory as a vader app'
-    when 'exec'
-      Vader::Exec.new.run
-    when 'up'
-      dc = '/usr/local/bin/docker-compose'
-      exec "#{dc} up -d && #{dc} logs app"
+    command = ARGV.shift
+
+    if COMMANDS.key?(command)
+      COMMANDS[command].call.new.run
     else
       # TODO: Print help
     end

data/lib/vader/docker_util.rb

@@ -0,0 +1,48 @@
+class Vader::DockerUtil
+  require 'socket'
+  require 'uri'
+
+  class << self
+    def ensure_docker_configured
+      # To ensure docker client will work:
+      # Check that ENV['DOCKER'] is set and can connect to the DOCKER_HOST.
+      # Otherwise, check `boot2docker status`.
+      # If b2d isn't running, start it.
+      # Get boot2docker ip address and set DOCKER_* env vars.
+      return if docker_configured?
+      ensure_boot2docker_running
+      set_docker_env
+
+    end
+
+    def ensure_boot2docker_running
+      if `boot2docker status`.chomp != 'running'
+        puts "Starting boot2docker"
+        `boot2docker up 2>/dev/null >/dev/null`
+        unless $?.success?
+          raise "Failed to start boot2docker. Try running 'boot2docker up'"
+        end
+      end
+    end
+
+    def set_docker_env
+      puts "Setting boot2docker environment variables"
+      `boot2docker shellinit 2>/dev/null`.split("\n").each do |line|
+        match = line.match(/(DOCKER\w+)=(.+)\Z/)
+        next unless match
+        ENV[match[1]] = match[2]
+      end
+    end
+
+    # Can we open a tcp socket to DOCKER_HOST?
+    def docker_configured?
+      return false unless ENV['DOCKER_HOST']
+      uri = URI.parse(ENV['DOCKER_HOST'])
+      TCPSocket.new(uri.host, uri.port).close
+      return true
+    rescue Errno::ECONNREFUSED
+      false
+    end
+  end
+
+end

data/lib/vader/exec.rb

@@ -1,11 +1,9 @@
 class Vader::Exec
 
   def run
-    command = [
-      "docker", "exec", "-ti", container,
-      # Set TERM for colors 🌈
-      "env", "TERM=#{ENV['TERM']}"
-    ] + ARGV
+    DockerUtil.ensure_docker_configured
+
+    command = [ "docker", "exec", "-ti", container ] + ARGV
 
     puts "Executing #{command.inspect}" if ENV['VADER_VERBOSE']
     exec(*command)

data/lib/vader/setup.rb

@@ -0,0 +1,6 @@
+class Vader::Setup
+
+  def run
+    exec File.expand_path('../../libexec/setup', File.dirname(__FILE__))
+  end
+end

data/lib/vader/sync.rb

@@ -63,6 +63,12 @@ class Vader::Sync
       exit 1
     end
 
+    # Do initial sync of each local watch path
+    local_watch_paths.each do |path|
+      puts "Doing initial sync of #{path}"
+      sync(path)
+    end
+
     # Watch for fs changes
     puts "Watching #{local_watch_paths.inspect} + #{CONFIG_DIR}" if verbose?
     fsevent = FSEvent.new

data/lib/vader/up.rb

@@ -0,0 +1,6 @@
+class Vader::Up
+
+  def run
+   exec File.expand_path('../../libexec/up', File.dirname(__FILE__))
+  end
+end

data/lib/vader/version.rb

@@ -1,3 +1,3 @@
 class Vader
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/libexec/setup

@@ -40,8 +40,16 @@ then
   rm -f $PKG
 fi
 
-/usr/local/bin/boot2docker init > /dev/null
+# Increase b2d VM memory to 4GB if the host has 8GB+
+if [ `sysctl hw.memsize | cut -d' ' -f2`  -ge 8589934592 ]
+then
+  b2d_memory=4096
+else
+  b2d_memory=2048
+fi
+/usr/local/bin/boot2docker init -m $b2d_memory > /dev/null
 
+##
 # Install docker-compose
 if [ ! -x /usr/local/bin/docker-compose ]
 then
@@ -50,6 +58,8 @@ then
   chmod +x /usr/local/bin/docker-compose
 fi
 
+##
+# Configure vader sync agent
 mkdir -p ~/Library/Logs/Vader
 /usr/bin/erb < `dirname $0`/../src/launchctl.plist.erb > "$HOME/Library/LaunchAgents/vader.sync.plist"
 launchctl load -Fw "$HOME/Library/LaunchAgents/vader.sync.plist" 2>/dev/null

data/libexec/up

@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+B2D='/usr/local/bin/boot2docker'
+DC='/usr/local/bin/docker-compose'
+
+if [ ! "`$B2D status`" = "running" ]
+then
+  $B2D up
+fi
+
+$DC up -d
+
+exec $DC logs app

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vader
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Aaron Suggs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
@@ -61,8 +61,12 @@ extra_rdoc_files: []
 files:
 - bin/vader
 - libexec/setup
+- libexec/up
+- lib/vader/docker_util.rb
 - lib/vader/exec.rb
+- lib/vader/setup.rb
 - lib/vader/sync.rb
+- lib/vader/up.rb
 - lib/vader/version.rb
 - lib/vader.rb
 - src/launchctl.plist.erb