appd 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfde514840abf3ced575c0a6e2f6cb3470150290
-  data.tar.gz: 87e2bdf442b99a9465a0f2a69d64ec051db10698
+  metadata.gz: a5963e0ac1ab04a116cf9b5811892b9119573201
+  data.tar.gz: c4c0f266776a42a515a6dc03db4b900b12609f16
 SHA512:
-  metadata.gz: 2fcc059df173e05c84f6ce6a2f1aab340a209377ada1c3a151b9d8f3702b2b0855faa91483cdaa6c2977503d58e7c4de677b34f260ccd01ee942d7d18f54d080
-  data.tar.gz: 149efeb8e3d49db78c5ea70c247254adf435104eaed5a0d335656ad95c292d07eb713c803d565f5673d4282cb5c6ec4a18102c3154d66c6b19d323df316b1c4b
+  metadata.gz: dcbcd3ce458e1040d885948fa14b8e535d01080f0b7cf951d380ebfd81bf51aaa0a2a6c5aa634da00da3844884d681706b11ab8543a91f6d00fee0410cfd96ba
+  data.tar.gz: 1e740550d3bf6a48a1dcff84112789cec7760fa921de0d9ef922e0078b5205d378988367f1345e81668524f17e3d835b53e11d1506bbbdf3e50afc42b28af1a4

data/README.md

@@ -26,8 +26,8 @@ Or install it yourself as:
 ## Usage
 
 ```sh
-# Setup $APP_PATH
-export APP_PATH /path/to/your/apps
+# Setup $APPS_PATH
+export APPS_PATH /path/to/your/apps
 
 # See help
 appd help
@@ -35,7 +35,7 @@ Usage:
   appd APPNAME command [OPTIONS]
 
 Options:
-  -p                           # Override $APP_PATH
+  -p                           # Override $APPS_PATH
   -f                           # Specify a docker-compose.yml file relative to the app
                                #   (defaults to: "docker-compose.yml")
   -s                           # Specify a docker server env file
@@ -49,7 +49,7 @@ Commands:
   restart SERVICES             # Restart services
   exec SERVICE -c "COMMAND"    # Execute a command in a running container
 
-Notes: Appd looks for apps in the $APP_PATH directory.
+Notes: Appd looks for apps in the $APPS_PATH directory.
        APPNAME can be . for current app.
 ```
 

data/exe/appd

@@ -8,10 +8,10 @@ require "appd/cli"
 
 if ARGV[0] != "help" && app = ARGV.shift
   if app == "."
-    ARGV << "--app-path"
+    ARGV << "-p"
     ARGV << Dir.pwd
   else
-    ARGV << "--app"
+    ARGV << "-a"
     ARGV << app
   end
 end

data/lib/appd/app.rb

@@ -32,12 +32,12 @@ module Appd
 
     private
 
-    def app_path
-      "#{options.app_path || ENV["APP_PATH"]}/#{options.app}"
+    def docker_compose_file
+      "#{options.apps_path}/#{options.app}/#{options.file}"
     end
 
     def docker_compose(command)
-      Appd.exec "direnv exec #{app_path} docker-compose -f #{app_path}/#{options.file} #{command}", server: options.server
+      Appd.exec "docker-compose -f #{docker_compose_file} #{command}", options
     end
   end
 end

data/lib/appd/cli.rb

@@ -2,7 +2,7 @@ require "thor"
 
 module Appd
   class CLI < Thor
-    class_option :app_path, type: :string, aliases: "-p", desc: "Override $APP_PATH"
+    class_option :apps_path, type: :string, aliases: "-p", default: Appd.apps_path, desc: "Override $APPS_PATH"
     class_option :app, type: :string, hide: true, aliases: "-a", required: ARGV.count > 0 &&
                                                                              ARGV[0] != 'help' &&
                                                                              ARGV[0] != "."
@@ -24,7 +24,7 @@ module Appd
       end
       puts "\nCommands:"
       self.class.commands.each { |_, command| printf "%-30s %s\n", "  #{command.usage} ", "# #{command.description}" }
-      puts "\nNotes: Appd looks for apps in the $APP_PATH directory."
+      puts "\nNotes: Appd looks for apps in the $APPS_PATH directory."
       puts "       APPNAME can be . for current app."
     end
 

data/lib/appd/version.rb

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

data/lib/appd.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appd
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Morgan Showman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Docker compose wrapper for managing containers.