appd 0.4.4 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c70cdc12650f1797a37f766edbf19dbfbe415416
-  data.tar.gz: 850737f8f46f4593dcf3c3a80ee185089e066948
+  metadata.gz: dfde514840abf3ced575c0a6e2f6cb3470150290
+  data.tar.gz: 87e2bdf442b99a9465a0f2a69d64ec051db10698
 SHA512:
-  metadata.gz: 74b3e36f40681ed700a34546b260e8719e7418ac3c477b6a2d7846fdcbbfe75fd41054bac1b75a3eec6193d09124891ae3794db8bf2dd350dc565905edae92a5
-  data.tar.gz: ee4030a341a16c36059c04da9d161cd40eac21b36e7c9cb0389067e8f259a5c5859928a5801e47e7464a61e6c1c59a2bf5b06fc85ea17ef1c92b8f72a87b797b
+  metadata.gz: 2fcc059df173e05c84f6ce6a2f1aab340a209377ada1c3a151b9d8f3702b2b0855faa91483cdaa6c2977503d58e7c4de677b34f260ccd01ee942d7d18f54d080
+  data.tar.gz: 149efeb8e3d49db78c5ea70c247254adf435104eaed5a0d335656ad95c292d07eb713c803d565f5673d4282cb5c6ec4a18102c3154d66c6b19d323df316b1c4b

data/README.md

@@ -32,7 +32,13 @@ export APP_PATH /path/to/your/apps
 # See help
 appd help
 Usage:
-  appd APPNAME command
+  appd APPNAME command [OPTIONS]
+
+Options:
+  -p                           # Override $APP_PATH
+  -f                           # Specify a docker-compose.yml file relative to the app
+                               #   (defaults to: "docker-compose.yml")
+  -s                           # Specify a docker server env file
 
 Commands:
   help                         # Show this help
@@ -43,8 +49,47 @@ Commands:
   restart SERVICES             # Restart services
   exec SERVICE -c "COMMAND"    # Execute a command in a running container
 
-Note: appd looks for apps in the $APP_PATH directory.
-      APPNAME can be . for current app.
+Notes: Appd looks for apps in the $APP_PATH directory.
+       APPNAME can be . for current app.
+```
+
+## Docker Server ENV Files
+Docker server env files are stored in `~/.appd/` and these files setup
+the current environment with the correct environment variables for
+connecting to docker. You can either specify the variables manually or
+execute the appropriate docker-machine command.
+
+### Manual ENV
+
+Usage:
+
+```sh
+appd my-app ps -s manual
+```
+
+ENV file:
+
+```sh
+# ~/.appd/manual
+export DOCKER_TLS_VERIFY="1"
+export DOCKER_HOST="tcp://127.0.0.1:2376"
+export DOCKER_CERT_PATH="/your/path/to/cert"
+unset  DOCKER_MACHINE_NAME
+```
+
+### Docker Machine ENV
+
+Usage:
+
+```sh
+appd my-app ps -s docker-machine
+```
+
+ENV file:
+
+```sh
+# ~/.appd/docker-machine
+eval "$(docker-machine env my-docker-machine)"
 ```
 
 ## Development

data/lib/appd/app.rb

@@ -37,7 +37,7 @@ module Appd
     end
 
     def docker_compose(command)
-      Appd.exec "direnv exec #{app_path} docker-compose -f #{app_path}/docker-compose.yml #{command}"
+      Appd.exec "direnv exec #{app_path} docker-compose -f #{app_path}/#{options.file} #{command}", server: options.server
     end
   end
 end

data/lib/appd/cli.rb

@@ -2,21 +2,30 @@ require "thor"
 
 module Appd
   class CLI < Thor
-    class_option :app_path, type: :string, hide: true
-    class_option :app, type: :string, hide: true, required: ARGV.count > 0 &&
-                                                              ARGV[0] != 'help' &&
-                                                              ARGV[0] != "."
+    class_option :app_path, type: :string, aliases: "-p", desc: "Override $APP_PATH"
+    class_option :app, type: :string, hide: true, aliases: "-a", required: ARGV.count > 0 &&
+                                                                             ARGV[0] != 'help' &&
+                                                                             ARGV[0] != "."
+    class_option :file, type: :string, aliases: "-f", default: "docker-compose.yml", desc: "Specify a docker-compose.yml file relative to the app"
+    class_option :server, type: :string, aliases: "-s", desc: "Specify a docker server env file"
 
     default_task :help
 
     desc "help", "Show this help"
     def help
       puts "Usage:"
-      puts "  appd APPNAME command\n\n"
-      puts "Commands:"
+      puts "  appd APPNAME command [OPTIONS]\n\n"
+      puts "Options:"
+      self.class.class_options.each do |_, option|
+        if !option.hide
+          printf "%-30s %s\n", "  #{option.aliases.join(", ")}  ", "# #{option.description}"
+          printf "%-30s %s\n", "", "#   (defaults to: \"#{option.default}\")" if option.default
+        end
+      end
+      puts "\nCommands:"
       self.class.commands.each { |_, command| printf "%-30s %s\n", "  #{command.usage} ", "# #{command.description}" }
-      puts "\nNote: appd looks for apps in the $APP_PATH directory."
-      puts "      APPNAME can be . for current app."
+      puts "\nNotes: Appd looks for apps in the $APP_PATH directory."
+      puts "       APPNAME can be . for current app."
     end
 
     desc "ps", "List containers"

data/lib/appd/version.rb

@@ -1,3 +1,3 @@
 module Appd
-  VERSION = "0.4.4"
+  VERSION = "0.5.1"
 end

data/lib/appd.rb

@@ -2,7 +2,7 @@ require "appd/app"
 require "appd/version"
 
 module Appd
-  def self.exec(command)
-    super command
+  def self.exec(command, **options)
+    super "#{"source ~/.appd/#{options[:server]} && " if options[:server]}#{command}"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appd
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.1
 platform: ruby
 authors:
 - Morgan Showman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler