dpl 1.7.17.travis.868.4 → 1.7.17.travis.869.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGIxZDVhM2Q0MmExZGMzMWIyOTdmN2QxMWFlYWNkMWUyOWU1ZGJkYw==
+    ZGMyYWFmM2JkMTU0MTBiM2MxZDJhOWQ5NDA3YjM0ZTRjMzQ1MjI5OA==
   data.tar.gz: !binary |-
-    ZThhNGNlN2E3YjFmNjUwNDdmZTdkYjA0YzkyZTViNjI0OTI0ZmUxYg==
+    MGY2MjM1YzFiYjNmYTU4MDgyYjRmNzM0YjhjOTgwOTIxOTQxMzVjMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGZkMWE5MmFjYmEwYTFmYjNlM2FhYzM1MGU4YzljNTkzZDM2YTI0NGJhOGE4
-    ZjAwZmMwZDgyNTZjNDlhMDhmMzcyOTBiYWU0YTg0MGY3ZGI4MDRlMTVkOTg5
-    MWMxOTgxZjRhZGMyMmE2Mjc4M2Q5Y2FjN2QxZWVjODRlMWIxZTA=
+    N2JjMzljMjViMTI4NDUwYjQyOWE0ODljZmRiYmI0ODQ4ODA3M2RjNWM4NDM2
+    NWI1MzRiOTJjMTY4YTgwYzc0ODY0MGU0YzQ3MDEzZWViZTgyMjljNzhiYTE4
+    MTNmMzcyOTEyOGZiOGRmMjZkNmE1NjdmNTQ2OTg2MGM0M2RiMWQ=
   data.tar.gz: !binary |-
-    YzAyZmZmNjg3ZDZlNWFmN2EyNGE0MjI3NGRkNTc1YzU5ZGRjNWIwMDVjOTYw
-    NjFhODA3Mzc0NmJlYjEyMThjNmFkODU4MjY2OTg0MzMwNWYxMmFhZDY1YWQy
-    NGIzMzYyZmZiNDhhN2I4NTU0NmVlYjNmZmU4ZTk4YTZiZjYyNWM=
+    ZTdlNWI3ZGQwYTVhYjAxOTJkMjI0MDlkOTYyYTE4MGVmZmIzMDcxOTIxNmE4
+    NmE2NGNmY2RjMTEzZTc2MmY1YTdmYjUzYjI1OTM2MWM0MjljNjIyYjQ0ZTc0
+    MDA2NjczNGQxZDFhODBiNjQ2NzdjMzVmMDVlMTk2MWU3NjQzODI=

data/README.md

@@ -1,4 +1,4 @@
-# Dpl [![Build Status](https://travis-ci.org/travis-ci/dpl.svg?branch=master)](https://travis-ci.org/travis-ci/dpl) [![Code Climate](https://codeclimate.com/github/travis-ci/dpl.png)](https://codeclimate.com/github/travis-ci/dpl) [![Gem Version](https://badge.fury.io/rb/dpl.png)](http://badge.fury.io/rb/dpl) [![Coverage Status](https://coveralls.io/repos/travis-ci/dpl/badge.png)](https://coveralls.io/r/travis-ci/dpl)
+# Dpl [![Build Status](https://travis-ci.org/travis-ci/dpl.svg?branch=master)](https://travis-ci.org/travis-ci/dpl) [![Code Climate](https://codeclimate.com/github/travis-ci/dpl.png)](https://codeclimate.com/github/travis-ci/dpl) [![Gem Version](https://badge.fury.io/rb/dpl.png)](http://badge.fury.io/rb/dpl) [![Coverage Status](https://coveralls.io/repos/travis-ci/dpl/badge.svg?branch=master&service=github)](https://coveralls.io/github/travis-ci/dpl?branch=master)
 
 ## Supported Providers:
 Dpl supports the following providers:

data/lib/dpl/provider.rb

@@ -6,40 +6,42 @@ module DPL
   class Provider
     include FileUtils
 
-    autoload :Heroku,           'dpl/provider/heroku'
     autoload :Appfog,           'dpl/provider/appfog'
-    autoload :EngineYard,       'dpl/provider/engine_yard'
-    autoload :DotCloud,         'dpl/provider/dot_cloud'
-    autoload :Nodejitsu,        'dpl/provider/nodejitsu'
-    autoload :Openshift,        'dpl/provider/openshift'
-    autoload :RubyGems,         'dpl/provider/rubygems'
-    autoload :NPM,              'dpl/provider/npm'
-    autoload :S3,               'dpl/provider/s3'
+    autoload :Atlas,            'dpl/provider/atlas'
+    autoload :Biicode,          'dpl/provider/biicode'
+    autoload :Bintray,          'dpl/provider/bintray'
+    autoload :BitBalloon,       'dpl/provider/bitballoon'
+    autoload :ChefSupermarket,  'dpl/provider/chef_supermarket'
+    autoload :Cloud66,          'dpl/provider/cloud66'
     autoload :CloudControl,     'dpl/provider/cloudcontrol'
+    autoload :CloudFiles,       'dpl/provider/cloud_files'
     autoload :CloudFoundry,     'dpl/provider/cloud_foundry'
     autoload :CodeDeploy,       'dpl/provider/code_deploy'
-    autoload :Lambda,           'dpl/provider/lambda'
-    autoload :PyPI,             'dpl/provider/pypi'
-    autoload :Divshot,          'dpl/provider/divshot'
-    autoload :CloudFiles,       'dpl/provider/cloud_files'
-    autoload :OpsWorks,         'dpl/provider/ops_works'
-    autoload :Modulus,          'dpl/provider/modulus'
-    autoload :Releases,         'dpl/provider/releases'
-    autoload :Cloud66,          'dpl/provider/cloud66'
-    autoload :Hackage,          'dpl/provider/hackage'
     autoload :Deis,             'dpl/provider/deis'
-    autoload :GCS,              'dpl/provider/gcs'
-    autoload :GAE,              'dpl/provider/gae'
-    autoload :BitBalloon,       'dpl/provider/bitballoon'
-    autoload :Biicode,          'dpl/provider/biicode'
+    autoload :Divshot,          'dpl/provider/divshot'
+    autoload :DotCloud,         'dpl/provider/dot_cloud'
     autoload :ElasticBeanstalk, 'dpl/provider/elastic_beanstalk'
-    autoload :PuppetForge,      'dpl/provider/puppet_forge'
-    autoload :Packagecloud,     'dpl/provider/packagecloud'
-    autoload :ChefSupermarket,  'dpl/provider/chef_supermarket'
-    autoload :TestFairy,        'dpl/provider/testfairy'
+    autoload :EngineYard,       'dpl/provider/engine_yard'
     autoload :ExoScale,         'dpl/provider/exoscale'
-    autoload :Bintray,          'dpl/provider/bintray'
+    autoload :GAE,              'dpl/provider/gae'
+    autoload :GCS,              'dpl/provider/gcs'
+    autoload :Hackage,          'dpl/provider/hackage'
+    autoload :Heroku,           'dpl/provider/heroku'
+    autoload :Lambda,           'dpl/provider/lambda'
+    autoload :Modulus,          'dpl/provider/modulus'
+    autoload :Nodejitsu,        'dpl/provider/nodejitsu'
+    autoload :NPM,              'dpl/provider/npm'
+    autoload :Openshift,        'dpl/provider/openshift'
+    autoload :OpsWorks,         'dpl/provider/ops_works'
+    autoload :Packagecloud,     'dpl/provider/packagecloud'
+    autoload :PuppetForge,      'dpl/provider/puppet_forge'
+    autoload :PyPI,             'dpl/provider/pypi'
+    autoload :Releases,         'dpl/provider/releases'
+    autoload :RubyGems,         'dpl/provider/rubygems'
+    autoload :S3,               'dpl/provider/s3'
     autoload :Script,           'dpl/provider/script'
+    autoload :TestFairy,        'dpl/provider/testfairy'
+    autoload :Transifex,        'dpl/provider/transifex'
 
 
     def self.new(context, options)

data/lib/dpl/provider/atlas.rb

@@ -0,0 +1,98 @@
+module DPL
+  class Provider
+    class Atlas < Provider
+      GIMME_URL = 'https://raw.githubusercontent.com/meatballhat/gimme/master/gimme'
+      ATLAS_UPLOAD_CLI_GO_REMOTE = 'github.com/hashicorp/atlas-upload-cli'
+      ATLAS_UPLOAD_BOOL_ARGS = %w(vcs debug).map(&:to_sym).freeze
+      ATLAS_UPLOAD_KV_ARGS = %w(address).map(&:to_sym).freeze
+      ATLAS_UPLOAD_KV_MULTI_ARGS = %w(exclude include metadata).map(&:to_sym).freeze
+      ATLAS_UPLOAD_INSTALL_SCRIPT = <<-EOF.gsub(/^ {8}/, '').strip
+        if ! command -v atlas-upload &>/dev/null ; then
+          mkdir -p $HOME/bin $HOME/gopath/src
+          export PATH="$HOME/bin:$PATH"
+
+          if ! command -v gimme &>/dev/null ; then
+            curl -sL -o $HOME/bin/gimme #{GIMME_URL}
+            chmod +x $HOME/bin/gimme
+          fi
+
+          export GOPATH="$HOME/gopath:$GOPATH"
+          eval "$(gimme 1.4.2)" &>/dev/null
+
+          go get #{ATLAS_UPLOAD_CLI_GO_REMOTE}
+          pushd $HOME/gopath/src/#{ATLAS_UPLOAD_CLI_GO_REMOTE} &>/dev/null
+          make &>/dev/null
+          cp bin/atlas-upload $HOME/bin/atlas-upload
+          popd &>/dev/null
+        fi
+      EOF
+
+      experimental 'Atlas'
+
+      def deploy
+        assert_app_present!
+        install_atlas_upload
+        super
+      end
+
+      def check_auth
+        ENV['ATLAS_TOKEN'] = options[:token] if options[:token]
+        error 'Missing ATLAS_TOKEN' unless ENV['ATLAS_TOKEN']
+      end
+
+      def needs_key?
+        false
+      end
+
+      def push_app
+        unless options[:paths]
+          here = Dir.pwd
+          warn "No paths specified.  Using #{here.inspect}."
+          options[:paths] = here
+        end
+
+        Array(options[:paths]).each do |path|
+          context.shell "atlas-upload #{atlas_upload_args} #{atlas_app} #{path}"
+        end
+      end
+
+      private
+
+      def install_atlas_upload
+        context.shell ATLAS_UPLOAD_INSTALL_SCRIPT
+      end
+
+      def assert_app_present!
+        error 'Missing Atlas app name' unless options.key?(:app)
+      end
+
+      def atlas_upload_args
+        return options[:args] if options.key?(:args)
+        return @atlas_upload_args if @atlas_upload_args
+
+        args = []
+
+        ATLAS_UPLOAD_BOOL_ARGS.each do |arg|
+          args << "-#{arg}" if options.key?(arg)
+        end
+
+        ATLAS_UPLOAD_KV_ARGS.each do |arg|
+          args << ["-#{arg}", options[arg].inspect].join('=') if options.key?(arg)
+        end
+
+        ATLAS_UPLOAD_KV_MULTI_ARGS.each do |arg|
+          next unless options.key?(arg)
+          Array(options[arg]).each do |arg_entry|
+            args << ["-#{arg}", arg_entry.inspect].join('=')
+          end
+        end
+
+        @atlas_upload_args = args.join(' ')
+      end
+
+      def atlas_app
+        @atlas_app ||= options.fetch(:app).to_s
+      end
+    end
+  end
+end

data/lib/dpl/provider/transifex.rb

@@ -0,0 +1,45 @@
+module DPL
+  class Provider
+    class Transifex < Provider
+      experimental 'Transifex'
+
+      DEFAULT_CLIENT_VERSION = '>=0.11'
+      DEFAULT_HOSTNAME = 'https://www.transifex.com'
+
+      def install_deploy_dependencies
+        cli_version = options[:cli_version] || DEFAULT_CLIENT_VERSION
+        self.class.pip 'transifex', 'transifex', cli_version
+      end
+
+      def needs_key?
+        false
+      end
+
+      def check_auth
+        install_deploy_dependencies
+        write_transifexrc
+        context.shell 'tx status'
+      end
+
+      def push_app
+        source_push
+      end
+
+      def write_transifexrc
+        File.open(File.expand_path('~/.transifexrc'), 'w') do |f|
+          f.puts [
+            "[#{options[:hostname] || DEFAULT_HOSTNAME}]",
+            "hostname = #{options[:hostname] || DEFAULT_HOSTNAME}",
+            "username = #{options[:username]}",
+            "password = #{options[:password]}",
+            "token = #{options[:token]}",
+          ].join("\n")
+        end
+      end
+
+      def source_push
+        context.shell 'tx push --source --no-interactive', retry: true
+      end
+    end
+  end
+end

data/spec/provider/atlas_spec.rb

@@ -0,0 +1,97 @@
+require 'securerandom'
+
+require 'spec_helper'
+require 'dpl/provider/atlas'
+
+describe DPL::Provider::Atlas do
+  before :all do
+    @origwd = Dir.pwd
+    @tmpdir = Dir.mktmpdir
+    ENV['HOME'] = @tmpdir
+    Dir.chdir(@tmpdir)
+  end
+
+  after :all do
+    FileUtils.rm_rf(@tmpdir) if @tmpdir
+    Dir.chdir(@origwd) if @origwd
+  end
+
+  let(:context) { DummyContext.new }
+  let(:options) { { token: SecureRandom.hex(16), include: 'bin/*', exclude: 'tmp/*' } }
+
+  subject(:provider) { described_class.new(context, options) }
+
+  describe '#check_auth' do
+    specify 'without ATLAS_TOKEN' do
+      provider.options.delete(:token)
+      expect { provider.check_auth }.to raise_error(DPL::Error)
+    end
+
+    specify 'with ATLAS_TOKEN' do
+      provider.options.update(token: SecureRandom.hex(16))
+      expect { provider.check_auth }.to_not raise_error
+    end
+  end
+
+  describe '#needs_key?' do
+    it { expect(provider.needs_key?).to eq(false) }
+  end
+
+  describe '#deploy' do
+    specify 'without :app aborts' do
+      provider.options.delete(:app)
+      expect { provider.deploy }.to raise_error(DPL::Error)
+    end
+
+    specify 'with :app does not abort' do
+      provider.options.update(app: 'dpl/testapp')
+      expect { provider.deploy }.to_not raise_error
+    end
+  end
+
+  describe 'building atlas-upload args' do
+    context 'when full args are provided' do
+      let(:options) { { args: '-whatever' } }
+
+      it 'returns full args directly' do
+        expect(provider.send(:atlas_upload_args)).to eql('-whatever')
+      end
+    end
+
+    context 'when no arg keys are provided' do
+      let(:options) { {} }
+
+      it 'returns empty args' do
+        expect(provider.send(:atlas_upload_args)).to eql('')
+      end
+    end
+
+    [
+      {
+        options: { wat: true, debug: true },
+        args: '-debug'
+      },
+      {
+        options: { vcs: nil },
+        args: '-vcs'
+      },
+      {
+        options: { include: ['build/*', 'bin/*'], exclude: '*.log' },
+        args: '-exclude="*.log" -include="build/*" -include="bin/*"'
+      },
+      {
+        options: {
+          include: 'bin/*',
+          exclude: ['*.log', '*.out'],
+          metadata: ['foo=bar', 'whatever=else']
+        },
+        args: '-exclude="*.log" -exclude="*.out" -include="bin/*" -metadata="foo=bar" -metadata="whatever=else"'
+      }
+    ].each_with_index do |example, i|
+      context "with options #{example[:options].inspect}" do
+        let(:options) { example[:options] }
+        it { expect(provider.send(:atlas_upload_args)).to eql(example[:args]) }
+      end
+    end
+  end
+end

data/spec/provider/transifex_spec.rb

@@ -0,0 +1,110 @@
+require 'spec_helper'
+require 'dpl/provider/transifex'
+
+describe DPL::Provider::Transifex do
+  let(:options) do
+    {
+      hostname: 'https://www.nottransifex.example.com',
+      username: 'travis',
+      password: 'secret',
+      token: 'abcd1234'
+    }
+  end
+
+  subject :provider do
+    described_class.new(DummyContext.new, options)
+  end
+
+  describe '#install_deploy_dependencies' do
+    context 'without version specified' do
+      example "installs #{described_class::DEFAULT_CLIENT_VERSION}" do
+        expect(provider.class).to(
+          receive(:pip).with('transifex', 'transifex', described_class::DEFAULT_CLIENT_VERSION)
+        )
+        provider.install_deploy_dependencies
+      end
+    end
+
+    context 'with version specified' do
+      before do
+        options[:cli_version] = '==0.12'
+      end
+
+      example 'installs custom version' do
+        expect(provider.class).to(
+          receive(:pip).with('transifex', 'transifex', '==0.12')
+        )
+        provider.install_deploy_dependencies
+      end
+    end
+  end
+
+  describe '#needs_key?' do
+    example do
+      expect(provider.needs_key?).to eq(false)
+    end
+  end
+
+  describe '#check_auth' do
+    before do
+      allow(provider).to receive(:install_deploy_dependencies)
+      allow(provider).to receive(:write_transifexrc)
+    end
+
+    example 'installs dependencies' do
+      expect(provider).to receive(:install_deploy_dependencies)
+      provider.check_auth
+    end
+
+    example 'writes ~/.transifexrc' do
+      expect(provider).to receive(:write_transifexrc)
+      provider.check_auth
+    end
+
+    example 'performs a tx status' do
+      expect(provider.context).to receive(:shell).with('tx status')
+      provider.check_auth
+    end
+  end
+
+  describe '#push_app' do
+    example 'delegates to the #source_push method' do
+      expect(provider).to receive(:source_push)
+      provider.push_app
+    end
+  end
+
+  describe '#source_push' do
+    example 'performs a tx push' do
+      expect(provider.context).to(
+        receive(:shell).with('tx push --source --no-interactive', retry: true)
+      )
+      provider.source_push
+    end
+  end
+
+  describe '#write_transifexrc' do
+    let(:fake_config) { StringIO.new }
+
+    before do
+      allow(File).to receive(:open).and_yield(fake_config)
+    end
+
+    example 'writes config with hostname header' do
+      expect(fake_config).to receive(:puts).with(/^\[#{options[:hostname]}\]/)
+      provider.write_transifexrc
+    end
+
+    %w(
+      hostname
+      username
+      password
+      token
+    ).map(&:to_sym).each do |key|
+      example "writes config with #{key} key" do
+        expect(fake_config).to receive(:puts).with(/^#{key} = #{options[key]}$/)
+        provider.write_transifexrc
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.17.travis.868.4
+  version: 1.7.17.travis.869.4
 platform: ruby
 authors:
 - Konstantin Haase
@@ -115,6 +115,7 @@ files:
 - lib/dpl/error.rb
 - lib/dpl/provider.rb
 - lib/dpl/provider/appfog.rb
+- lib/dpl/provider/atlas.rb
 - lib/dpl/provider/biicode.rb
 - lib/dpl/provider/bintray.rb
 - lib/dpl/provider/bitballoon.rb
@@ -154,12 +155,14 @@ files:
 - lib/dpl/provider/s3.rb
 - lib/dpl/provider/script.rb
 - lib/dpl/provider/testfairy.rb
+- lib/dpl/provider/transifex.rb
 - lib/dpl/version.rb
 - notes/dotcloud.md
 - notes/engine_yard.md
 - notes/heroku.md
 - spec/cli_spec.rb
 - spec/provider/appfog_spec.rb
+- spec/provider/atlas_spec.rb
 - spec/provider/bintray_spec.rb
 - spec/provider/bitballoon_spec.rb
 - spec/provider/chef_supermarket_spec.rb
@@ -193,6 +196,7 @@ files:
 - spec/provider/s3_spec.rb
 - spec/provider/script_spec.rb
 - spec/provider/testfairy_spec.rb
+- spec/provider/transifex_spec.rb
 - spec/provider_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/travis-ci/dpl