yu 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bce149a98ba79b8e5b443d5e08b6a72de4ef4f2
-  data.tar.gz: 8dc032e5e7f950be1caa09c1a10e6acb073c1d20
+  metadata.gz: 966869713d53857c276a5a5b42402c5c7eee1bf2
+  data.tar.gz: b8944277007f182c41e5b29e4f40fc342673af4f
 SHA512:
-  metadata.gz: 582744c63acc6a1e4fdca8765abd8e7a6f298d9035fac47eaf0978345d4da7cd38a3c36351ca752c83b06ba620ff36b519f3985587372f48ab8bf84cc0f688c8
-  data.tar.gz: 3faa57ff181c2c5209c6c699eeb6252f657cc2263d4b83eb25d362dd2b0de440bb057283018d923b01c8672c343c7cd774ef1cc60cd7e942169f50a48633843c
+  metadata.gz: df8665a17bf5526d9cb8a65696e2ea19e1a430f1c04c07a494b610a143d9da126db4aa9255d25c62c3198bd85129b7ef1c11bf89f0495bd22325460618fa1f3b
+  data.tar.gz: a1b1732be30ae876cbca0e46e61cbaacc75c79da98933486d2bc77f5dcd4423cb0432adaaac92fddb657af6566aa6d13d87abebb8cfeee6313448b8336d43f62

data/README.md

@@ -30,6 +30,10 @@ yu shell --test api
 yu build
 # Build base image for specific service(s)
 yu build api web
+# Restart all containers
+yu restart
+# Restart speciic container(s)
+yu restart web
 ```
 
 ## Development

data/lib/yu.rb

@@ -35,7 +35,8 @@ module Yu
 
       command :reset do |c|
         c.syntax = 'yu reset'
-        c.description = 'Reset everything'
+        c.description = 'Fresh build of images for all services and restart'
+        c.option '--without-cache'
         c.action(method(:reset))
       end
 
@@ -45,6 +46,24 @@ module Yu
         c.action(method(:doctor))
       end
 
+      command :restart do |c|
+        c.syntax = 'yu restart'
+        c.description = 'Restart containers for service(s)'
+        c.action(method(:restart))
+      end
+
+      command :start do |c|
+        c.syntax = 'yu start'
+        c.description = 'Start containers containers for service(s)'
+        c.action(method(:restart))
+      end
+
+      command :recreate do |c|
+        c.syntax = 'yu recreate'
+        c.description = 'Recreate containers for service(s)'
+        c.action(method(:recreate))
+      end
+
       global_option('-V', '--verbose', 'Verbose output') { $verbose_mode = true }
 
       run!
@@ -54,15 +73,15 @@ module Yu
 
     def test(args, options)
       if args.none?
-        target_containers = testable_containers
+        target_services = testable_services
       else
-        target_containers = args.map(&method(:normalise_container_name_from_dir))
+        target_services = args.map(&method(:normalise_service_name_from_dir))
       end
 
-      results = target_containers.map do |container|
-        info "Running tests for #{container}..."
+      results = target_services.map do |service|
+        info "Running tests for #{service}..."
         run_command(
-          "docker-compose run --rm #{container} bin/test",
+          "docker-compose run --rm #{service} bin/test",
           exit_on_failure: false,
         )
       end
@@ -71,28 +90,28 @@ module Yu
     end
 
     def build(args, options)
-      target_containers = args.map(&method(:normalise_container_name_from_dir))
-      if target_containers.none?
-        target_gemfiled_containers = gemfiled_containers
+      target_services = args.map(&method(:normalise_service_name_from_dir))
+      if target_services.none?
+        target_gemfiled_services = gemfiled_services
       else
-        target_gemfiled_containers = gemfiled_containers & target_containers
+        target_gemfiled_services = gemfiled_services & target_services
       end
 
-      target_gemfiled_containers.each(&method(:package_gems_for_container))
+      target_gemfiled_services.each(&method(:package_gems_for_service))
       info "Building images..."
-      execute_command("docker-compose build #{target_containers.join(" ")}")
+      execute_command("docker-compose build #{target_services.join(" ")}")
     end
 
     def shell(args, options)
       case args.count
       when 0
-        info "Please provide container"
+        info "Please provide service"
         exit 1
       when 1
-        target_container = normalise_container_name_from_dir(args.first)
+        target_service = normalise_service_name_from_dir(args.first)
         env_option = options.test ? "-e APP_ENV=test" : ""
-        info "Loading #{"test" if options.test} shell for #{target_container}..."
-        execute_command("docker-compose run --rm #{env_option} #{target_container} bash")
+        info "Loading #{"test" if options.test} shell for #{target_service}..."
+        execute_command("docker-compose run --rm #{env_option} #{target_service} bash")
       else
         info "One at a time please!"
         exit 1
@@ -101,18 +120,18 @@ module Yu
 
     def reset(args, options)
       info "Packaging gems in all services containing a Gemfile"
-      gemfiled_containers.each(&method(:package_gems_for_container))
+      gemfiled_services.each(&method(:package_gems_for_service))
       info "Killing any running containers"
       run_command("docker-compose kill")
       info "Removing all existing containers"
       run_command "docker-compose rm --force"
       info "Building fresh images"
-      run_command "docker-compose build"
+      run_command "docker-compose build #{'--no-cache' if options.without_cache}"
       if File.exists? 'seed'
         info "Seeding system state"
         run_command "./seed"
       end
-      info "Bringing all containers up"
+      info "Bringing containers up for all services"
       run_command "docker-compose up -d --no-recreate"
     end
 
@@ -132,6 +151,19 @@ module Yu
       info "Everything looks good."
     end
 
+    def restart(args, options)
+      service_list = args.map(&method(:normalise_service_name_from_dir)).join(" ")
+      run_command "docker-compose kill #{service_list}"
+      run_command "docker-compose up -d --no-recreate #{service_list}"
+    end
+
+    def recreate(args, options)
+      service_list = args.map(&method(:normalise_service_name_from_dir)).join(" ")
+      run_command "docker-compose kill #{service_list}"
+      run_command "docker-compose rm --force #{service_list}"
+      run_command "docker-compose up -d #{service_list}"
+    end
+
     def run_command(command, showing_output: true, exit_on_failure: true)
       unless showing_output || verbose_mode?
         command = "#{command} &>/dev/null"
@@ -155,24 +187,24 @@ module Yu
       end
     end
 
-    def package_gems_for_container(container)
-      info "Packaging gems for #{container}"
-      run_command("cd #{container} && bundle package --all")
+    def package_gems_for_service(service)
+      info "Packaging gems for #{service}"
+      run_command("cd #{service} && bundle package --all")
     end
 
-    def gemfiled_containers
-      containers_with_file("Gemfile")
+    def gemfiled_services
+      services_with_file("Gemfile")
     end
 
-    def testable_containers
-      containers_with_file("bin/test")
+    def testable_services
+      services_with_file("bin/test")
     end
 
-    def normalise_container_name_from_dir(container_name_or_dir)
-      File.basename(container_name_or_dir)
+    def normalise_service_name_from_dir(service_name_or_dir)
+      File.basename(service_name_or_dir)
     end
 
-    def containers_with_file(file)
+    def services_with_file(file)
       Dir.glob("*/#{file}").map { |dir_path| dir_path.split("/").first }
     end
 

data/lib/yu/version.rb

@@ -1,3 +1,3 @@
 module Yu
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yu
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mike Kelly
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander