generators_rails 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 323432ef9a1bc89dd6c87452ecffeece5d233326
-  data.tar.gz: 440cdd4ebe5524a7a173329d69f9a680dcf0c16e
+  metadata.gz: 4bce5f73364ba24b1b66155736aca185e1d43163
+  data.tar.gz: 573a30d54a8543220ac3c99f6bc606ae6be66300
 SHA512:
-  metadata.gz: 8cc31ee8aa8d4e511bed17e182a37bcdc0577206c8dd8836ab61917d1239ad6143a312495db539e854a8256731564169235f43339d2f4a8f35241eed79e43d5f
-  data.tar.gz: b32944c2ae3b2c324d973c7a0a2b02a83453c8314bda2b9d6b917e0948c475d7bfb9dfce34efac8528bf318e36a034b1cb1c8735b3ac2e1fa759ecf8ebaea15a
+  metadata.gz: 65ef6d1b5f5e923264a97f1577860e5e517230c5b87320ae832fb0e20870c449bd2b747ad1277d07e118467df274dd0d718a217144ac1f6d618df26e63c558ac
+  data.tar.gz: e1df0756e198ad98d27dede109a9440b5de5fb8b0f17eaf58ef3bd7bb9b00c8b669ecac79a29e0dc098ed50b6e4e9013bff52eee6e3511cffe013721c7864213

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

@@ -9,8 +9,8 @@ end
 
 class Hash
   def method_missing(methodname, *params)
-    if self.class == Hash && key?(methodname.to_s)
-      self[methodname.to_s]
+    if self.class == Hash
+      self[methodname]||self[methodname.to_s]
     else
       super
     end
@@ -20,19 +20,21 @@ end
 namespace :docker do
   config = JSON.parse(File.read('docker/dockerconfig.json'))
   TAG = ENV['TAG'] || 'latest'
-  desc 'exec bash for service container'
+  debug_yml = ENV['DEBUG_YAML'] || config.debug_yml
+  prod_yml = ENV['PROD_YAML'] || config.prod_yml
+  docker_repo = ENV['DOCKER_REPO'] || config.docker_repo
   task :bash, [:service] do |_t, args|
-    exec_cmd("TAG=#{TAG} docker-compose -f #{config.debug_yml} exec #{args[:service] || config.service_name} #{config.shell_command}")
+    exec_cmd("TAG=#{TAG} docker-compose -f #{debug_yml} exec #{args[:service] || config.service_name} #{config.shell_command}")
   end
 
   desc 'destroy all services container'
   task :down do |_t, _args|
-    exec_cmd("TAG=#{TAG} docker-compose -f #{config.debug_yml} down")
+    exec_cmd("TAG=#{TAG} docker-compose -f #{debug_yml} down")
   end
 
   desc 'run test with docker'
   task test: :up do
-    exec_cmd("TAG=#{TAG} docker-compose -f #{config.debug_yml} exec #{config.service_name} #{config.test_command}")
+    exec_cmd("TAG=#{TAG} docker-compose -f #{debug_yml} exec #{config.service_name} #{config.test_command}")
   end
 
   desc 'run rspec with docker'
@@ -41,22 +43,22 @@ namespace :docker do
 
   desc 'start service with docker with prod env'
   task :run do
-    exec_cmd("TAG=#{TAG} docker-compose -f #{config.prod_yml} up  -d")
+    exec_cmd("TAG=#{TAG} dockese -f #{prod_yml} up  -d")
   end
 
   desc 'start service with docker in debug mode '
   task :up do
-    exec_cmd("TAG=#{TAG} docker-compose -f #{config.debug_yml} up  -d")
+    exec_cmd("TAG=#{TAG} docker-compose -f #{debug_yml} up  -d")
   end
 
   desc 'debug service with docker '
   task debug: :up do
-    exec_cmd("TAG=#{TAG} docker-compose -f #{config.debug_yml} exec #{config.service_name} #{config.up_command}")
+    exec_cmd("TAG=#{TAG} docker-compose -f #{debug_yml} exec #{config.service_name} #{config.up_command}")
   end
 
   desc 'rubocop service with docker '
   task lint: :up do
-    exec_cmd("TAG=#{TAG} docker-compose -f #{config.debug_yml} exec -T #{config.service_name}  #{config.lint_command}")
+    exec_cmd("TAG=#{TAG} docker-compose -f #{debug_yml} exec -T #{config.service_name}  #{config.lint_command}")
   end
 
   desc 'gitpull'
@@ -66,7 +68,7 @@ namespace :docker do
 
   desc 'precheck before release'
   task precommit: %i[lint test gitpull] do |_t, _args|
-    exec_cmd("TAG=#{TAG} docker-compose -f #{config.debug_yml} down")
+    exec_cmd("TAG=#{TAG} docker-compose -f #{debug_yml} down")
     hammer.say 'Precommit succeed.'
   end
 
@@ -78,17 +80,17 @@ namespace :docker do
 
   desc 'release docker image '
   task :release do |_t, _args|
-    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}"
+    if `TAG=#{TAG} docker images -f reference=#{config.image_name}:#{TAG} -q`.chop.empty?
+      hammer.say('There is no local image for push')
+    else
+      remote_image = "#{docker_repo}/#{config.image_name}:#{TAG}"
+      tag_cmd = "TAG=#{TAG} docker tag #{config.image_name}:#{TAG} #{remote_image}"
       exec_cmd(tag_cmd)
       push_cmd = "TAG=#{TAG} docker push #{remote_image}"
       exec_cmd(push_cmd)
       rmi_cmd = "TAG=#{TAG} docker rmi #{remote_image}"
       exec_cmd(rmi_cmd)
       hammer.say('pls commit code and push it manually！！')
-    else
-      hammer.say('There is no local image for push')
     end
   end
   desc 'show docker config'
@@ -101,7 +103,7 @@ namespace :docker do
   desc 'parse dockerfile and docker-compose'
   task :parse do
     match = ->(rexp) { File.open(config.docker_file).grep(rexp).first.match(rexp)[1] }
-    service_config = YAML.load_file(config.prod_yml)
+    service_config = YAML.load_file(prod_yml)
     image = service_config['services'][config.service_name]['image'].match(/((.*)\/)?(.*)/)
     image_name = image[3].gsub('${TAG}', ENV['TAG'] || 'latest')
     last_build_time = `docker inspect -f '{{ .Created }}' #{image_name}`.chop
@@ -131,9 +133,11 @@ namespace :docker do
 
   private
 
-  def exec_cmd(cmdstr)
-    hammer.say cmdstr
-    hammer.run(cmdstr)
+  def exec_cmd(*cmdstr, **opt)
+    hammer.say cmdstr.join(' ')
+    ret = hammer.run(cmdstr.join(' '), opt)
+    exit -1 unless ret
+    ret
   end
 
   def hammer

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

@@ -47,7 +47,7 @@ module Rancher
 
     def ignore(filename, content)
       if file? filename
-        append_to_file filename, content
+        append_to_file filename, content+"\n"
       else
         create_file filename, content
       end

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

@@ -8,8 +8,8 @@ end
 
 class Hash
   def method_missing(methodname, *params)
-    if self.class == Hash && key?(methodname.to_s)
-      self[methodname.to_s]
+    if self.class == Hash
+      self[methodname]||self[methodname.to_s]
     else
       super
     end
@@ -17,14 +17,14 @@ class Hash
 end
 
 namespace :rancher do
-  rancherconfig = 'rancher/rancherconfig.json'
+  rancherconfig = ENV['RANCHER_CONFIG'] || 'rancher/rancherconfig.json'
   dockerconfig = 'docker/dockerconfig.json'
   config = File.exist?(rancherconfig) ? JSON.parse(File.read(rancherconfig)) : {}
   docker_config = JSON.parse(File.read(dockerconfig))
-  docker_file = 'docker/docker-compose.yml'
+  docker_file = ENV['RANCHER_DOCKER_FILE'] || docker_config.rancher_yml || docker_config.prod_yml
   rancher_file = 'rancher/rancher-compose.yml'
   tag = ENV['TAG'] || 'latest'
-  RANCHER = "rancher -c #{rancherconfig}"
+  RANCHER = "rancher -c #{rancherconfig}".freeze
   File.write('rancher/.env.tmp', "TAG=#{tag}")
   RANCHER_UP = [
     RANCHER,
@@ -87,6 +87,7 @@ namespace :rancher do
     exec_cmd(RANCHER_UP,
              '--force-upgrade',
              '--pull',
+             '-d',
              _args[:service] || docker_config.service_name)
   end
 
@@ -188,7 +189,9 @@ namespace :rancher do
 
   def exec_cmd(*cmdstr, **opt)
     hammer.say cmdstr.join(' ')
-    hammer.run(cmdstr.join(' '), opt)
+    ret = hammer.run(cmdstr.join(' '), opt)
+    exit -1 unless ret
+    ret
   end
 
   def hammer

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

@@ -7,6 +7,7 @@ module Rspec
       gem 'spring-commands-rspec'
       gem_group :test, :development do
         gem 'rspec-rails'
+        gem 'factory_girl'
         gem 'factory_girl_rails'
         gem 'database_cleaner'
         gem 'faker'
@@ -54,15 +55,15 @@ module Rspec
 RSpec.configure do |config|
   config.use_transactional_fixtures = false
   config.include FactoryGirl::Syntax::Methods
+  config.fail_fast = true
   config.before(:suite) do
     DatabaseCleaner.strategy = :#{strategy}
-    DatabaseCleaner.clean_with(:truncation)
   end
-
-  config.around(:each) do |example|
-    DatabaseCleaner.cleaning do
-      example.run
-    end
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+  config.after(:each) do
+    DatabaseCleaner.clean_with(:truncation, except: %w[])
   end
 end
 CODE

data/lib/generators_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: generators_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - shaoyang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails