generators_rails 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 914fc3e4b1f4e40599b753681bee0f502b77cff2
-  data.tar.gz: d1ff48e2cbef5afec03e5cd2e7910b1899c21f44
+  metadata.gz: 323432ef9a1bc89dd6c87452ecffeece5d233326
+  data.tar.gz: 440cdd4ebe5524a7a173329d69f9a680dcf0c16e
 SHA512:
-  metadata.gz: 6bce52e3469ef1a1dc723261cfdd13bfb0121fbf459f9a1beed16bf581ce34827228645e14913ddea98e22a34cf67a3ed989ce092f1a81d515993c838f2a6d4f
-  data.tar.gz: 412afc6c8bf29fd9a33de550db9e2884e5a9bda74460eced8fc944e0280b6e9106d886bc055d72ca6e074206b2604090bfa1ac8e20dee355d141e8780d30d9ff
+  metadata.gz: 8cc31ee8aa8d4e511bed17e182a37bcdc0577206c8dd8836ab61917d1239ad6143a312495db539e854a8256731564169235f43339d2f4a8f35241eed79e43d5f
+  data.tar.gz: b32944c2ae3b2c324d973c7a0a2b02a83453c8314bda2b9d6b917e0948c475d7bfb9dfce34efac8528bf318e36a034b1cb1c8735b3ac2e1fa759ecf8ebaea15a

data/lib/generators/docker/config/templates/docker.rake

@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 
 require 'thor'
@@ -77,7 +78,7 @@ namespace :docker do
 
   desc 'release docker image '
   task :release do |_t, _args|
-    if `TAG=#{TAG} docker images -f reference=#{config.image_name}:#{TAG} -q`.chop.present?
+    unless `TAG=#{TAG} docker images -f reference=#{config.image_name}:#{TAG} -q`.chop.empty?
       remote_image = "#{config.docker_repo}/#{config.image_name}:#{TAG}"
       tag_cmd = "TAG=#{TAG} docker tag #{config.image_name} #{remote_image}"
       exec_cmd(tag_cmd)

data/lib/generators/rancher/config/config_generator.rb

@@ -22,8 +22,8 @@ module Rancher
 
     def ignore_rancher_config
       ignore('.gitignore', 'rancher/rancherconfig.json')
-      ignore('.dockerignore', 'rancher/')
       ignore('.dockerignore', 'lib/tasks/rancher.rake')
+      ignore('.dockerignore', 'rancher/')
     end
 
     def create_ranche_compose

data/lib/generators/rancher/config/templates/rancher.rake

@@ -24,7 +24,7 @@ namespace :rancher do
   docker_file = 'docker/docker-compose.yml'
   rancher_file = 'rancher/rancher-compose.yml'
   tag = ENV['TAG'] || 'latest'
-  RANCHER = "rancher -c #{rancherconfig}".freeze
+  RANCHER = "rancher -c #{rancherconfig}"
   File.write('rancher/.env.tmp', "TAG=#{tag}")
   RANCHER_UP = [
     RANCHER,
@@ -54,7 +54,7 @@ namespace :rancher do
   task :up, [:deamon] do |_t, _args|
     exec_cmd(RANCHER_UP,
              '--upgrade',
-             '--pull #{_args[:deamon]}')
+             "--pull #{_args[:deamon]}")
   end
   desc 'rancher inspect stack'
   task :inspect, [:opt] do |_t, _args|
@@ -127,6 +127,21 @@ namespace :rancher do
     exec_cmd(RANCHER, 'stacks')
   end
 
+  desc 'rancher ps service'
+  task :ps, [:service] do |_t, _args|
+    result = exec_cmd(RANCHER,
+                      'inspect',
+                      _args[:service] || "#{config.stack}/#{docker_config.service_name}",
+                      capture: true)
+    puts(JSON.pretty_generate(JSON.parse(result)))
+  end
+
+  desc 'rancher ps stack'
+  task :psk do |_t, _args|
+    result = exec_cmd(RANCHER, 'inspect', config.stack, capture: true)
+    puts(JSON.pretty_generate(JSON.parse(result)))
+  end
+
   desc 'rancher ls volume'
   task lsv: [:volume] do |_t, _args|
   end
@@ -171,13 +186,9 @@ namespace :rancher do
 
   private
 
-  def exec_cmd(*cmdstr)
+  def exec_cmd(*cmdstr, **opt)
     hammer.say cmdstr.join(' ')
-    hammer.run(cmdstr.join(' '))
-  end
-
-  def hello
-    p :hello
+    hammer.run(cmdstr.join(' '), opt)
   end
 
   def hammer

data/lib/generators_rails/version.rb

@@ -1,3 +1,3 @@
 module GeneratorsRails
-  VERSION = '0.0.4'.freeze
+  VERSION = '0.0.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: generators_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - shaoyang