capistrano-env 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 550785f8cee8eb6aa25a022631db453481d3bcee
-  data.tar.gz: 13c5af95d7e0b000a192062eef021f1e297f01bf
+  metadata.gz: 4e80641440a240740aa442c7b08635229133b96e
+  data.tar.gz: 845db65140d86877fa247ffc14f44d18dbb74b6b
 SHA512:
-  metadata.gz: 5a082f8b3daec5596c9a82567cc9d513524ed91b411d5e53aac5336756e743d8c6448e04b8f3f43631c52ab449b0e91b1989be54c0c82f4eeac8c13562c792f5
-  data.tar.gz: 4a805077d5574262e75bff2b0c159065a8f0c9e7619011b96b7dc63bf63f653d00ecafdf1eba463cd39d54c2fa7834735e00553baf5535ec0e281eec23d7ca42
+  metadata.gz: 8f8997657b5ad98511c1b9828cd397dbb6e84321cf90883ed974a3045958ab1f45da0e89193f1c9a71844eade6d1fd65724f2053f6a2e3de9b11097ceb37c80e
+  data.tar.gz: 1c3b2f26217acc7cda4a1edc8644a69487ea0fec4c47c7fdab27ac08dffec50434ba3668cd9ee670699aa85f96023201e82397fe0b634265369f6450cc7d67d0

data/.travis.yml

@@ -2,6 +2,9 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1.3
+gemfile:
+  - gemfiles/cap3.gemfile
+  - gemfiles/cap2.gemfile
 script:
   - bundle exec rake spec
   - bundle exec rubocop

data/Gemfile

@@ -2,11 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in capistrano-env.gemspec
 gemspec
-
-group :development, :test do
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-rubocop'
-  gem 'pry'
-  gem 'coveralls', require: false
-end

data/README.md

@@ -27,10 +27,15 @@ Or install it yourself as:
 
 ## Usage
 
+### 1. set env names in deploy.rb
 
-#### 1. set env names in deploy.rb
+#### Capistrano 2.x
+
+in `deploy.rb`
 
 ```ruby
+require 'capistrano/env/v2'
+
 capenv.use do |env|
   env.add /^MYAPP_/
   env.add /^MYAPP_/ do |key|
@@ -42,7 +47,29 @@ capenv.use do |env|
 end
 ```
 
-#### 2. deploy
+#### Capistrano 3.x
+
+in `Capfile`
+
+```ruby
+require 'capistrano/env/v3'
+```
+
+in `deploy.rb`
+
+```ruby
+Capistrano::Env.use do |env|
+  env.add /^MYAPP_/
+  env.add /^MYAPP_/ do |key|
+     key.gsub /^MYAPP_/, '' # replace keyname like MYAPP_DATABASE_URL => DATABASE_URL
+  end
+  env.add 'UNICORN_PROCESSES'
+  env.add 'HOGE', 'hage'
+  env.formatter = :dotenv #=> default is :ruby, but it is deprecated now.
+end
+```
+
+### 2. deploy
 
 ```
 bundle exec cap production deploy

data/capistrano-env.gemspec

@@ -17,14 +17,20 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.post_install_message = 'formatter :ruby is deprecated! use :dotenv instead of :ruby.'
-  spec.add_dependency 'rails', '>= 3.0', '< 5.0'
+  spec.post_install_message = 'formatter :ruby is removed! use :dotenv instead of :ruby.'
+
+  spec.add_dependency 'capistrano'
+  spec.add_dependency 'sshkit'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'capistrano', '~> 2'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'guard-rubocop'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-doc'
+  spec.add_development_dependency 'coveralls'
 end

data/gemfiles/cap2.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in capistrano-env.gemspec
+gemspec path: '../'
+
+gem 'capistrano', '< 3'

data/gemfiles/cap3.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in capistrano-env.gemspec
+gemspec path: '../'
+
+gem 'capistrano', ENV['CAPISTRANO_VERSION'] || '>= 3'

data/lib/capistrano/env/config.rb

@@ -1,3 +1,5 @@
+require 'capistrano/env/formatter'
+
 module Capistrano
   module Env
     class Config
@@ -9,14 +11,11 @@ module Capistrano
       end
 
       def formatter
-        self.formatter = :ruby unless @formatter
+        self.formatter = :dotenv unless @formatter
         @formatter
       end
 
-      def formatter=(value)
-        warn 'formatter :ruby is deprecated! use :dotenv with dotenv(-rails).gem' if value == :ruby
-        @formatter = value
-      end
+      attr_writer :formatter
 
       def add(name_or_regexp, val = nil, &block)
         if val && name_or_regexp.is_a?(String)

data/lib/capistrano/env/formatter.rb

@@ -0,0 +1,11 @@
+module Capistrano
+  module Env
+    module Formatter
+      class Base
+        def self.filename
+          "capenv.#{extname}"
+        end
+      end
+    end
+  end
+end

data/lib/capistrano/env/{plugin.rb → v2/plugin.rb}

@@ -1,3 +1,5 @@
+require 'capistrano'
+
 module Capistrano
   module Env
     module Plugin

data/lib/capistrano/env/v2.rb

@@ -0,0 +1,4 @@
+require 'capistrano/env/version'
+
+require 'capistrano/env/config'
+require 'capistrano/env/v2/plugin'

data/lib/capistrano/env/v3/tasks/env.rake

@@ -0,0 +1,19 @@
+namespace :capenv do
+  desc 'copy .env to release_path'
+  task :copy do
+    on roles(:all) do
+      upload! StringIO.new(Capistrano::Env.to_s), "#{release_path}/#{Capistrano::Env.filename}"
+    end
+  end
+
+  task :set_envs do
+    set :default_environment, Capistrano::Env.envs
+  end
+end
+
+stages.each do |stage|
+  after stage, 'capenv:set_envs'
+end
+
+after 'deploy:updating', 'capenv:copy'
+before 'deploy:restart', 'capenv:copy'

data/lib/capistrano/env/v3.rb

@@ -0,0 +1,4 @@
+require 'capistrano/env/version'
+require 'capistrano/env'
+
+load File.expand_path('../v3/tasks/env.rake', __FILE__)

data/lib/capistrano/env/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Env
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/lib/capistrano/env.rb

@@ -1,17 +1,27 @@
-require 'capistrano/env/version'
+require 'capistrano/env/config'
 
 module Capistrano
   module Env
-    module Formatter
-      class Base
-        def self.filename
-          "capenv.#{extname}"
-        end
-      end
+    def self.use(&block)
+      block.call(config)
+    end
+
+    def self.envs
+      config.envs
+    end
+
+    def self.to_s
+      config.capenv_content
+    end
+
+    def self.filename
+      config.capenv_file
+    end
+
+    private
+
+    def self.config
+      @config ||= Capistrano::Env::Config.new
     end
   end
 end
-
-require 'capistrano/env/plugin'
-require 'capistrano/env/config'
-require 'capistrano/env/railtie' if defined? Rails

data/lib/capistrano-env.rb

@@ -1 +1 @@
-require 'capistrano/env'
+require 'capistrano/env/v2' if defined?(Capistrano) && Capistrano.respond_to?(:plugin) # capistrano-2.x

data/spec/capistrano/env/config_spec.rb

@@ -1,24 +1,25 @@
-require 'rails_helper'
+require 'gem_helper'
+require 'capistrano/env/config'
 
 describe Capistrano::Env::Config do
   let(:config) { described_class.new }
   describe '#formatter' do
-    it { expect(config.formatter).to eq :ruby }
+    it { expect(config.formatter).to eq :dotenv }
   end
 
   describe '#formatter class' do
-    it { expect(config.formatter_class).to eq Capistrano::Env::Formatter::RubyFormatter }
+    it { expect(config.formatter_class).to eq Capistrano::Env::Formatter::DotenvFormatter }
   end
 
   describe '#capenv_file' do
-    it { expect(config.capenv_file).to eq 'capenv.rb' }
+    it { expect(config.capenv_file).to eq '.env' }
   end
 
   describe '#capenv_content' do
     it do
-      require 'capistrano/env/formatter/ruby_formatter'
+      require 'capistrano/env/formatter/dotenv_formatter'
       allow(config).to receive(:envs).and_return('a' => 'b')
-      expect(Capistrano::Env::Formatter::RubyFormatter).to receive(:format).with('a' => 'b').and_return 'hello'
+      expect(Capistrano::Env::Formatter::DotenvFormatter).to receive(:format).with('a' => 'b').and_return 'hello'
       expect(config.capenv_content).to eq 'hello'
     end
   end

data/spec/capistrano/env/formatter/dotenv_formatter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'gem_helper'
 require 'capistrano/env/formatter/dotenv_formatter'
 
 describe Capistrano::Env::Formatter::DotenvFormatter do

data/spec/capistrano/env/{plugin_spec.rb → v2/plugin_spec.rb}

@@ -1,7 +1,10 @@
-require 'spec_helper'
-require 'capistrano'
+require 'gem_helper'
+require 'capistrano/env/v2'
 
 describe Capistrano::Env::Plugin do
+  before do
+    skip 'capistrano-3.x not support it' unless Capistrano.respond_to?(:plugin)
+  end
   let(:capistrano) { Capistrano::Configuration.new }
 
   describe '#capenv' do

data/spec/capistrano/env_spec.rb

@@ -1,7 +1,14 @@
-require 'rails_helper'
+require 'gem_helper'
+require 'capistrano/env'
 
 describe Capistrano::Env do
-  it 'should have a version number' do
-    expect(Capistrano::Env::VERSION).not_to be_nil
+  before do
+    Capistrano::Env.use do |env|
+      env.add 'HELLO', 'WORLD'
+    end
   end
+
+  it { expect(Capistrano::Env.to_s.chomp).to eq 'HELLO="WORLD"' }
+  it { expect(Capistrano::Env.envs).to eq 'HELLO' => 'WORLD' }
+  it { expect(Capistrano::Env.filename).to eq '.env' }
 end

data/spec/gem_helper.rb

@@ -0,0 +1,3 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'coveralls'
+Coveralls.wear!

metadata

@@ -1,35 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-env
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - masarakki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sshkit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,19 +123,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capistrano
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: capistrano with environments
 email:
 - masaki@hisme.net
@@ -145,75 +209,29 @@ files:
 - README.md
 - Rakefile
 - capistrano-env.gemspec
+- gemfiles/cap2.gemfile
+- gemfiles/cap3.gemfile
 - lib/capistrano-env.rb
 - lib/capistrano/env.rb
 - lib/capistrano/env/config.rb
+- lib/capistrano/env/formatter.rb
 - lib/capistrano/env/formatter/dotenv_formatter.rb
-- lib/capistrano/env/formatter/ruby_formatter.rb
-- lib/capistrano/env/plugin.rb
-- lib/capistrano/env/railtie.rb
+- lib/capistrano/env/v2.rb
+- lib/capistrano/env/v2/plugin.rb
+- lib/capistrano/env/v3.rb
+- lib/capistrano/env/v3/tasks/env.rake
 - lib/capistrano/env/version.rb
 - spec/capistrano/env/config_spec.rb
 - spec/capistrano/env/formatter/dotenv_formatter_spec.rb
-- spec/capistrano/env/formatter/ruby_formatter_spec.rb
-- spec/capistrano/env/plugin_spec.rb
-- spec/capistrano/env/railtie_spec.rb
+- spec/capistrano/env/v2/plugin_spec.rb
 - spec/capistrano/env_spec.rb
-- spec/dummy/.gitignore
-- spec/dummy/Gemfile
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/images/.keep
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/concerns/.keep
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/mailers/.keep
-- spec/dummy/app/models/.keep
-- spec/dummy/app/models/concerns/.keep
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/capenv.rb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/hoge.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/seeds.rb
-- spec/dummy/lib/assets/.keep
-- spec/dummy/lib/tasks/.keep
-- spec/dummy/log/.keep
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/robots.txt
-- spec/dummy/vendor/assets/javascripts/.keep
-- spec/dummy/vendor/assets/stylesheets/.keep
-- spec/rails_helper.rb
+- spec/gem_helper.rb
 - spec/spec_helper.rb
 homepage: https://github.com/masarakki/capistrano-env
 licenses:
 - MIT
 metadata: {}
-post_install_message: formatter :ruby is deprecated! use :dotenv instead of :ruby.
+post_install_message: formatter :ruby is removed! use :dotenv instead of :ruby.
 rdoc_options: []
 require_paths:
 - lib
@@ -236,57 +254,7 @@ summary: capistrano with environments
 test_files:
 - spec/capistrano/env/config_spec.rb
 - spec/capistrano/env/formatter/dotenv_formatter_spec.rb
-- spec/capistrano/env/formatter/ruby_formatter_spec.rb
-- spec/capistrano/env/plugin_spec.rb
-- spec/capistrano/env/railtie_spec.rb
+- spec/capistrano/env/v2/plugin_spec.rb
 - spec/capistrano/env_spec.rb
-- spec/dummy/.gitignore
-- spec/dummy/Gemfile
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/images/.keep
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/concerns/.keep
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/mailers/.keep
-- spec/dummy/app/models/.keep
-- spec/dummy/app/models/concerns/.keep
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/capenv.rb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/hoge.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/seeds.rb
-- spec/dummy/lib/assets/.keep
-- spec/dummy/lib/tasks/.keep
-- spec/dummy/log/.keep
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/robots.txt
-- spec/dummy/vendor/assets/javascripts/.keep
-- spec/dummy/vendor/assets/stylesheets/.keep
-- spec/rails_helper.rb
+- spec/gem_helper.rb
 - spec/spec_helper.rb