teleporter 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b695b5ced85a0ad75c33028a396f322e9b8a3d5f
-  data.tar.gz: 28ba326e9816865229cb0b0c8f383598e96f3c56
+  metadata.gz: 7b210d332c23d4e0c84087864dfe8e06cb90b580
+  data.tar.gz: 09b1c02581376875059b007788f02d19a230ac3f
 SHA512:
-  metadata.gz: e35464cf955ec872623ad479d8e0f8e0ad61803c542c4d7d19595b141b4e746d451e0bd5b9af691805f451c0edeb1d19bcc6e6ebdb443914e60006ab51ba7052
-  data.tar.gz: 92f93c88c9533067e2aea218dbd9ffc44593df6186f9ed532a31b3b123e967b871f34d59f734f68e022c523580a0556eb81af6b7fb98abbe6a0264274e25d2cb
+  metadata.gz: 33e66b2ea59f6789f7c04c6caa4adc5ecbb9103b9a6fbf0a8eefeaa4e55cc8d805dbcf422ae31ff471584aac073bd5545f5092f5a1bdc5c7022296849069a8d8
+  data.tar.gz: 92c1299b54e7e65052041b36f3b369fb6e5c5fc7177457becee4547b48af6b74324f674d53228ff1f3f79c2c949a4ac803e0b4379bb9b4c630d8d0b48559db06

data/lib/generators/teleport/capistrano.rb

@@ -28,9 +28,6 @@ module Teleport
       insert_into_file "Capfile",
                        "require 'capistrano/sidekiq'\n",
                        after: "require 'capistrano/rails/migrations'\n"
-      insert_into_file "Capfile",
-                       "require 'capistrano/puma'\n",
-                       after: "require 'capistrano/sidekiq'\n"
       insert_into_file "Capfile",
                        %Q{
 require 'capistrano/puma'

data/lib/generators/teleport/templates/capistrano/deploy/deploy.rb.tt

@@ -1,5 +1,3 @@
-lock '3.2.1'
-
 set :repo_url, '<%= @git_repo_url %>'
 set :application, '<%= @app_name %>'
 set :deploy_to, -> { "/home/#{fetch(:deploy_user)}/apps/#{fetch(:application)}_#{fetch(:stage)}" }

data/lib/generators/teleport/templates/capistrano/deploy/production.rb.tt

@@ -1,6 +1,7 @@
 set :stage, :production
 set :rails_env, :production
-set :branch, "master"
+set :branch, 'master'
+
 set :deploy_user, '<%= @deploy_user %>'
 set :ip, '<%= @production_server_address %>'
 

data/lib/generators/teleport/templates/capistrano/deploy/staging.rb.tt

@@ -1,6 +1,7 @@
 set :stage, :staging
 set :rails_env, :staging
-set :branch, "master"
+set :branch, 'master'
+
 set :deploy_user, '<%= @deploy_user %>'
 set :ip, '<%= @staging_server_address %>'
 

data/lib/generators/teleport/templates/capistrano/tasks/setup_config.rake

@@ -25,8 +25,6 @@ namespace :deploy do
       ])
       execute :mkdir, "-p #{shared_path}/config"
       execute :mkdir, "-p #{current_path}"
-      application = fetch(:application)
-      stage = fetch(:stage)
 
       config_files = fetch(:config_files)
       config_files.each do |file|
@@ -72,7 +70,7 @@ end
 def sub_strings(input_string)
   output_string = input_string
   input_string.scan(/{{(\w*)}}/).each do |var|
-    output_string.gsub!("{{#{var[0]}}}", fetch(var[0].to_sym))
+    output_string.gsub!("{{#{var[0]}}}", fetch(var[0].to_sym).to_s)
   end
   output_string
 end

data/lib/generators/teleport/templates/capistrano/tasks/setup_db.rake

@@ -21,7 +21,7 @@ namespace :deploy do
   timeout: 5000
   encoding: utf8
   reconnect: false
-  database: #{fetch(:application)}
+  database: #{fetch(:application)}_#{fetch(:stage)}
   pool: 5
   username: #{fetch(:deploy_user)}
   password: #{fetch(:db_password)}
@@ -44,7 +44,7 @@ namespace :deploy do
     rescue Exception
     end
     begin
-      execute %Q{echo "CREATE DATABASE #{fetch(:application)} WITH OWNER #{fetch(:deploy_user)} ENCODING 'UTF8';" | sudo -u postgres psql}
+      execute %Q{echo "CREATE DATABASE #{fetch(:application)}_#{fetch(:stage)} WITH OWNER #{fetch(:deploy_user)} ENCODING 'UTF8';" | sudo -u postgres psql}
     rescue Exception
     end
     end

data/lib/teleporter/version.rb

@@ -1,3 +1,3 @@
 module Teleporter
-  VERSION = "2.0.10"
+  VERSION = "2.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teleporter
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - Ponomarev Nikolay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties