dpl 1.5.7 → 1.5.8.travis.303.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: ac24731a8f60f3ed3d36dfa3388e0275958dd5ae
-  data.tar.gz: c76e49e9f146ebc60247340769bc22688ee0acfc
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWE3NzVjZWU5MDNiOWQxYTc4MGI4ZDliYzUwZDU2NzI2ZjZmZjA1ZQ==
+  data.tar.gz: !binary |-
+    MDdiNTA4NTU4ODE5MjRlZGZlMGNjZWI1YWRhOGQyOGNmZmE3ZTc2NQ==
 SHA512:
-  metadata.gz: 230aed4cb5a962e5ab7a40a1d7a3b574c1e9b45268c86af9a4484384b7784bea80dd895efa145a44c809c146dbd426f6ceda9a6518992aff94f279ae40dc1203
-  data.tar.gz: 53a33c9629bf256122287a6a3dad92bf229311cb741708afbe92340b4467b794ece39a000e0618a45933d0f6b98120260ee2a07530b658438198fcfc80708c6b
+  metadata.gz: !binary |-
+    MTkzODdlMWI2ZTZjZmQzOThiZGQ4NzlmZTFlYzA1OTMxODU5Njc4M2UzNDAy
+    ZjM0YWYyMjFkNTg5MWE1MWVjZmI0MzJkY2M2YTdmNWQ3YjFiZjk4MGE3ZGYw
+    YWEwOWYxOTRmNTNiNWMxYzRjMTFlNThlY2VkMjI0NjI2ZTdkNGU=
+  data.tar.gz: !binary |-
+    YTg1ZWNhYTk4OTYwY2VkMjQ0Yzc4YmU5MzMzMDNiY2I0OGJmZmZiZWJiODIy
+    M2MyODU1MWYzYWVjZDIxZmVhMTAwMWM1MzUwOTc3NDNlY2JlNmU2MDhlYWQx
+    ZTY1OGU4NTVhOTU2M2U3NmFiNmJjZmVmY2U4MTZjNmY3YzFhYzc=

data/Gemfile

@@ -2,29 +2,30 @@ source 'https://rubygems.org'
 gemspec
 
 group :cloudfoundry do
-  gem 'cf'
+  gem 'cf', '~> 5.4.5'
 end
 
 group :heroku do
-  gem 'rendezvous'
-  gem 'heroku-api'
-  gem 'anvil-cli'
+  gem 'rendezvous', '~> 0.0.2'
+  gem 'heroku-api', '~> 0.3.16'
+  gem 'anvil-cli', '~> 0.16.1'
 end
 
 group :openshift do
   gem 'rhc'
 end
 
-#group :appfog do
-#  gem 'af'
-#end
+group :appfog do
+  gem 'af'
+end
 
 group :rubygems do
-  gem 'gems', '>= 0.8.3'
+  gem 'gems'
 end
 
 group :sss do
   gem 'aws-sdk'
+  gem 'mime-types'
 end
 
 group :cloud_files do

data/README.md

@@ -19,6 +19,7 @@ Dpl supports the following providers:
 * [Divshot.io](#divshotio)
 * [Rackspace Cloud Files](#rackspace-cloud-files)
 * [AWS OpsWorks](#opsworks)
+* [Modulus](#modulus)
 
 ## Installation:
 
@@ -72,6 +73,18 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
 #### Examples:
     dpl --provider=nodejitsu --username=<username> --api-key=<api-key>
 
+
+### Modulus
+
+#### Options:
+
+* **api-key** Modulus Authentication Token
+* **project-name** Modulus Project to Deploy
+
+#### Example:
+    dpl --provider=modulus --api-key=<api-key> --project-name=<project-name>
+
+
 ### Engine Yard:
 
 #### Options:

data/lib/dpl/provider.rb

@@ -20,6 +20,7 @@ module DPL
     autoload :Divshot,      'dpl/provider/divshot'
     autoload :CloudFiles,   'dpl/provider/cloud_files'
     autoload :OpsWorks,     'dpl/provider/ops_works'
+    autoload :Modulus,      'dpl/provider/modulus'
 
     def self.new(context, options)
       return super if self < Provider

data/lib/dpl/provider/modulus.rb

@@ -0,0 +1,23 @@
+module DPL
+  class Provider
+    class Modulus < Provider
+      npm_g 'modulus'
+
+      def check_auth
+        raise Error, "must supply an api key" unless option(:api_key)
+      end
+
+      def check_app
+        raise Error, "must supply a project name" unless option(:project_name)
+      end
+
+      def needs_key?
+        false
+      end
+
+      def push_app
+        context.shell "MODULUS_TOKEN=#{option(:api_key)} modulus deploy -p #{option(:project_name)}"
+      end
+    end
+  end
+end

data/lib/dpl/provider/s3.rb

@@ -4,6 +4,7 @@ module DPL
   class Provider
     class S3 < Provider
       requires 'aws-sdk'
+      requires 'mime-types'
 
       def api
         @api ||= AWS::S3.new
@@ -33,7 +34,8 @@ module DPL
       def push_app
         Dir.chdir(options.fetch(:local_dir, Dir.pwd)) do
           Dir.glob("**/*") do |filename|
-            api.buckets[option(:bucket)].objects.create(upload_path(filename), File.read(filename)) unless File.directory?(filename)
+            content_type = MIME::Types.type_for(filename).first.to_s
+            api.buckets[option(:bucket)].objects.create(upload_path(filename), File.read(filename), :content_type => content_type) unless File.directory?(filename)
           end
         end
       end

data/spec/provider/modulus_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'dpl/provider/modulus'
+
+describe DPL::Provider::Modulus do
+  subject :provider do
+    described_class.new(DummyContext.new, :api_key => 'test-token', :project_name => 'test-project')
+  end
+
+  describe :check_auth do
+    it 'should require an api key' do
+      provider.options.update(:api_key => nil)
+      expect{ provider.check_auth }.to raise_error("must supply an api key")
+    end
+  end
+
+  describe :check_app do
+    it 'should require a project name' do
+      provider.options.update(:project_name => nil)
+      expect{ provider.check_app }.to raise_error("must supply a project name")
+    end
+  end
+
+  describe :push_app do
+    it 'should include the api key and project name specified' do
+      provider.context.should_receive(:shell).with("MODULUS_TOKEN=test-token modulus deploy -p test-project")
+      provider.push_app
+    end
+  end
+end

data/spec/provider/s3_spec.rb

@@ -60,6 +60,12 @@ describe :needs_key? do
       Dir.should_receive(:chdir).with('BUILD')
       provider.push_app
     end
+
+    example "Sends MIME type" do
+      Dir.should_receive(:glob).and_yield(__FILE__)
+      AWS::S3::ObjectCollection.any_instance.should_receive(:create).with(anything(), anything(), hash_including(:content_type => 'application/x-ruby'))
+      provider.push_app
+    end
   end
 
   describe :api do   

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8.travis.303.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   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: rake
   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: simplecov
   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: json
   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: deploy tool abstraction for clients
@@ -95,6 +95,7 @@ files:
 - lib/dpl/provider/heroku.rb
 - lib/dpl/provider/heroku/anvil.rb
 - lib/dpl/provider/heroku/git.rb
+- lib/dpl/provider/modulus.rb
 - lib/dpl/provider/nodejitsu.rb
 - lib/dpl/provider/npm.rb
 - lib/dpl/provider/openshift.rb
@@ -114,6 +115,7 @@ files:
 - spec/provider/dotcloud_spec.rb
 - spec/provider/heroku_anvil_spec.rb
 - spec/provider/heroku_git_spec.rb
+- spec/provider/modulus_spec.rb
 - spec/provider/npm.rb
 - spec/provider/openshift_spec.rb
 - spec/provider/ops_works_spec.rb
@@ -132,35 +134,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: deploy tool
-test_files:
-- spec/cli_spec.rb
-- spec/provider/appfog_spec.rb
-- spec/provider/cloud_files_spec.rb
-- spec/provider/cloudcontrol_spec.rb
-- spec/provider/divshot_spec.rb
-- spec/provider/dotcloud_spec.rb
-- spec/provider/heroku_anvil_spec.rb
-- spec/provider/heroku_git_spec.rb
-- spec/provider/npm.rb
-- spec/provider/openshift_spec.rb
-- spec/provider/ops_works_spec.rb
-- spec/provider/pypi_spec.rb
-- spec/provider/rubygems_spec.rb
-- spec/provider/s3_spec.rb
-- spec/provider_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 
+test_files: []