appd 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5963e0ac1ab04a116cf9b5811892b9119573201
-  data.tar.gz: c4c0f266776a42a515a6dc03db4b900b12609f16
+  metadata.gz: b7157dd873827a3f1010c410bbefb4035038ea4d
+  data.tar.gz: 651ac243ffcc7b05b5639b37506a8fb820423fa6
 SHA512:
-  metadata.gz: dcbcd3ce458e1040d885948fa14b8e535d01080f0b7cf951d380ebfd81bf51aaa0a2a6c5aa634da00da3844884d681706b11ab8543a91f6d00fee0410cfd96ba
-  data.tar.gz: 1e740550d3bf6a48a1dcff84112789cec7760fa921de0d9ef922e0078b5205d378988367f1345e81668524f17e3d835b53e11d1506bbbdf3e50afc42b28af1a4
+  metadata.gz: d1e1d79b66dcce4c4ea4abc93e9a8f5839c991a39ffce4da7261ddaed5a6be6a0177663a253fbc523dfed7b79f6ffb411505aa87d2724dc50af9acf89afc5dba
+  data.tar.gz: cb0b688732b81bfcc79805eea7625cddcc0fa0639d7d5a087f03f89004c73d8653eb13edf3afd76d1bac566ab350aa497ef9a1021061918e99ab1aeb4e36e94e

data/README.md

@@ -42,6 +42,7 @@ Options:
 
 Commands:
   help                         # Show this help
+  select                       # Select a Docker Server ENV file to use
   ps                           # List containers
   build SERVICES               # Build or rebuild services
   up SERVICES                  # Create and start services
@@ -51,6 +52,7 @@ Commands:
 
 Notes: Appd looks for apps in the $APPS_PATH directory.
        APPNAME can be . for current app.
+       The currently selected Docker Server ENV file is stored in ~/.appd/current-server
 ```
 
 ## Docker Server ENV Files

data/exe/appd

@@ -6,7 +6,12 @@ Signal.trap("INT") { exit 1 }
 require "appd"
 require "appd/cli"
 
-if ARGV[0] != "help" && app = ARGV.shift
+APPD_PATH = File.expand_path("~/.appd")
+
+Dir.mkdir(APPD_PATH) if !File.directory?(APPD_PATH)
+File.write("#{APPD_PATH}/current-server") if !File.file?("#{APPD_PATH}/current-server")
+
+if ARGV[0] != "help" && ARGV[0] != "select" && app = ARGV.shift
   if app == "."
     ARGV << "-p"
     ARGV << Dir.pwd

data/lib/appd/cli.rb

@@ -4,7 +4,8 @@ module Appd
   class CLI < Thor
     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] != "help" &&
+                                                                             ARGV[0] != "select" &&
                                                                              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"
@@ -26,6 +27,12 @@ module Appd
       self.class.commands.each { |_, command| printf "%-30s %s\n", "  #{command.usage} ", "# #{command.description}" }
       puts "\nNotes: Appd looks for apps in the $APPS_PATH directory."
       puts "       APPNAME can be . for current app."
+      puts "       The currently selected Docker Server ENV file is stored in ~/.appd/current-server"
+    end
+
+    desc "select", "Select a Docker Server ENV file to use"
+    def select(server)
+      Appd.select(server)
     end
 
     desc "ps", "List containers"

data/lib/appd/version.rb

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

data/lib/appd.rb

@@ -7,6 +7,16 @@ module Appd
   end
 
   def self.exec(command, options)
-    super "#{"source ~/.appd/#{options.server} && " if options.server}direnv exec #{options.apps_path}/#{options.app} #{command}"
+    super "source ~/.appd/#{options.server ? options.server : "current-server"} && direnv exec #{options.apps_path}/#{options.app} #{command}"
+  end
+
+  def self.select(server)
+    if File.file?("#{APPD_PATH}/#{server}")
+      print "Selecting the #{server} Docker Server ENV file..."
+      File.open("#{APPD_PATH}/current-server", "w") { |f| f.write("source ~/.appd/#{server}") }
+      puts "Done!"
+    else
+      puts "There is no Docker Server ENV file for #{server}..."
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appd
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Morgan Showman