capistrano-upload-config 0.7.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 374f20ce7842bdf074f18ef70955c338da2a8a77
-  data.tar.gz: aeddf47b8458c7f70ed29344a54a77d7f755afe3
+  metadata.gz: 358c1cccd790b716915fa7f506cd42460620b91b
+  data.tar.gz: 9db4df937dd439546bcb70bc426cd345a6e833ab
 SHA512:
-  metadata.gz: dc85496ab5ad9f57bd3c6e5c22189e489b15664444b469d7b9d7476231496cc87918dc3e69ea798b3017a6a35e391904cdfc973a60187d349ad5940df388671b
-  data.tar.gz: 49294687f402d65e0f3ffbce4d0ff1072b2dbafd82d20b050777b2ca4e531d6970ecd01eff75c0445849fb35963c79753a2a12117687557361483556a23b47ce
+  metadata.gz: 2b05de93c46b982ef597d735d651f30792ee08be7a81fdf2ed526eef58f9d5b760b7b77e99ee78828c972a6b91d697f0d336a11bd63e041bbc6749e3786dca62
+  data.tar.gz: 538de4da01294100d615b13448f0d8deeff29b4dc042ea16f9c33d28def5310b11f202664e568c781fe6f8a442c583d3354d025821f6a65cfa94b950ab534c49

data/README.md

@@ -76,7 +76,7 @@ This task creates the config on the remote server.
 
 
 ```shell
-$ cap staging config:init
+$ cap staging config:push
  WARN Already Exists: config/database.staging.yml
  INFO Copied: config/example.yml-example to config/example.staging.yml
  Created: config/foobar.staging.yml as empty file
@@ -113,6 +113,7 @@ Configurable options, shown here with defaults:
 ```ruby
 set :config_files, fetch(:linked_files)
 set :config_example_suffix, '-example'
+set :local_base_dir, ''
 ```
 
 By default your `:linked_files` are assumed to be config files, this might be totally wrong for your environment, never fear just:
@@ -156,6 +157,18 @@ set :config_files, [ ".env.php" ]
 Running `cap staging config:push` will upload the remote file as
 `.env.staging.php`, rather than `.env.php`.
 
+#### Local Base Dir
+
+Using this option you can base your local config file/s in any directory, if unset they're assumed to be in the current directory tree.
+
+```ruby
+# in deploy.rb
+
+set :local_base_dir, '..'
+```
+
+For example Capistrano is outside of the application root and your config lives relative to the directory above.
+
 ## Contributing
 
 1. Fork it

data/capistrano-upload-config.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capistrano-upload-config'
-  spec.version       = '0.7.0'
+  spec.version       = '0.8.2'
   spec.authors       = 'Robert Coleman'
   spec.email         = 'github@robert.net.nz'
   spec.description   = %q{Capistrano 3.x tasks to upload shared config that is stored outside of SCM}

data/lib/capistrano/tasks/upload-config.rake

@@ -4,7 +4,7 @@ namespace :config do
   task :init do
     run_locally do
       fetch(:config_files).each do |config|
-        local_path = CapistranoUploadConfig::Helpers.get_local_config_name(config, fetch(:stage).to_s)
+        local_path = CapistranoUploadConfig::Helpers.get_config_name(config, fetch(:stage).to_s, fetch(:local_base_dir).to_s)
         if File.exists?(local_path)
           warn "Already Exists: #{local_path}"
         else
@@ -25,7 +25,7 @@ namespace :config do
   task :check do
     run_locally do
       fetch(:config_files).each do |config|
-        local_path = CapistranoUploadConfig::Helpers.get_local_config_name(config, fetch(:stage).to_s)
+        local_path = CapistranoUploadConfig::Helpers.get_config_name(config, fetch(:stage).to_s, fetch(:local_base_dir).to_s)
         if File.exists?(local_path)
           info "Found: #{local_path}"
         else
@@ -41,7 +41,7 @@ namespace :config do
       within shared_path do
         use_stage_remotely = fetch(:config_use_stage_remotely)
         fetch(:config_files).each do |config|
-          local_path = CapistranoUploadConfig::Helpers.get_local_config_name(config, fetch(:stage).to_s)
+          local_path = CapistranoUploadConfig::Helpers.get_config_name(config, fetch(:stage).to_s, fetch(:local_base_dir).to_s)
           server_name = use_stage_remotely ? local_path.split('/').last : config
           if File.exists?(local_path)
             info "Uploading config #{local_path} as #{server_name}"
@@ -60,7 +60,7 @@ namespace :config do
       within shared_path do
         use_stage_remotely = fetch(:config_use_stage_remotely)
         fetch(:config_files).each do |config|
-          local_path = CapistranoUploadConfig::Helpers.get_local_config_name(config, fetch(:stage).to_s)
+          local_path = CapistranoUploadConfig::Helpers.get_config_name(config, fetch(:stage).to_s, fetch(:local_base_dir).to_s)
           server_name = use_stage_remotely ? local_path.split('/').last : config
           info "Downloading config #{server_name} as #{local_path} "
           download! File.join(shared_path, server_name), local_path
@@ -73,12 +73,11 @@ end
 
 namespace :load do
   task :defaults do
-
+    set :local_base_dir, '.'
     set :config_files, -> { fetch(:linked_files) }
     set :config_example_suffix, '-example'
     # https://github.com/rjocoleman/capistrano-upload-config/issues/1
     set :config_example_prefix, -> { fetch(:config_example_suffix) }
     set :config_use_stage_remotely, false
-
   end
 end

data/lib/capistrano/upload-config.rb

@@ -4,14 +4,14 @@ module CapistranoUploadConfig
   class Helpers
     class << self
 
-      def get_local_config_name(config, stage)
-        path = File.dirname(config)
+      def get_config_name(config, stage, local_base_dir)
+        path = File.dirname(File.join(local_base_dir, config))
         extension = File.extname(config)
         filename = File.basename(config, extension)
         extension.sub!(/^\./, '')
         local_file = [filename, stage].join('.')
         local_file = [local_file, extension].join('.') unless extension.empty?
-        local_path = File.join(path, local_file)
+        File.join(path, local_file)
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-upload-config
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Robert Coleman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2017-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -88,9 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Capistrano 3.x tasks to upload shared config that is stored outside of SCM
 test_files: []
-has_rdoc: