travis-custom-deploy 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzc1YWRhMjQ4MGUyNGY3Y2Y0OTllMzdhNjNmMTFiNjFkMTE4OGFlMA==
+    YTUxNjk3YmFiMmMwMzE3N2RmZmY3M2Q2OGFkZWRjNDc4ZmY4NTU3NQ==
   data.tar.gz: !binary |-
-    NDFiZTRkNWI5ZjRjOGU4NTM4ZWY2MWEyNjEyYzMyYWMwODBkNzY1NQ==
+    ZGI0MGM2ZTRjY2ZkZTQyMzc3YzQwNjJhOTMyZjllZGJkZjgxZjNkZQ==
 SHA512:
   metadata.gz: !binary |-
-    NGZhZTAyOWM5MzIxYjkyODRlNWMzMTk3YTQwMDZjMmQ0N2JmMGQ3OTBkYWVj
-    ZGQyNTU2YmQyYTJjMmY5OTYwNDAyOGZmNWU2ZTZlMmE2ZGQ0NWJmZjZmNTk0
-    ZWUyM2RlYjM1M2U0NTIyZTMwODNlM2FkNjA5MjZhMGE4YzQ2YWQ=
+    Yzg5OWJmNmFjYmQyMjM0ZTQzYTUyNDhhN2ZhNGZlZGRjNWI1NjhkODBhMWJi
+    ZDI3NGVlNTdiNWExNjJjODUzZDE5YmZkNGM0NmIzOTEwZWM1OWVjOGU2YTM1
+    NmZmNjJkYWQwMGQxY2U5MWFiODIzYjhjZTFhZmYxNWJkZTM3NWQ=
   data.tar.gz: !binary |-
-    M2E1M2RkZmU4YWNjNTQ1NWVjZDAxMjQ5NTJkZDVjYzMyOWZjNGNkNmIxNTcw
-    OTg1NDJiYzViOTAyYTk2Y2JmNTZiYTEyMGY0YzBmMjQ5NjE5YWI3NTg0NjU5
-    YjJmNmU2MWU0MTYyMDhmNTJiOTU2N2U1MjcxNDc4Mzc2ZTE5Yjg=
+    YmJmODZjZDM1MTg1NjQwOTQyNDQyNGZlOTQ1ZGE4YzZjYTZhZjU1NDhhMDRh
+    YzdmMmJhMDU0NTE2ZmFlMWMzMTgxYzZhNjAwNzI0MTVhNzRmNmZkODQwOTJm
+    NzU1ZTQ5OGU2NTlmZTAyY2I4YzRmYzEzOWM1NWRkMjZlYWE0OGE=

data/README.md

@@ -12,7 +12,7 @@ Configuration
 Add the gem to your Gemfile or gemspec.
 
 ```ruby
-gem "travis-custom-deploy", "~> 0.0.4"
+gem "travis-custom-deploy", "~> 0.0.6"
 ```
 To use travis-custom-deploy with Travis-CI you need to define environment variables. I recommend
 to use [secure environment variables](http://about.travis-ci.org/docs/user/build-configuration/#Secure-environment-variables) with Travis-CI. The best way to do that is to use travis gem:

data/bin/travis-custom-deploy

@@ -5,6 +5,7 @@ require 'travis-custom-deploy'
 # The usage for the binary of travis-custom-deploy
 def usage
   puts 'Usage: travis-custom-deploy TRANSFER_TYPE FILES...'
+  exit 1
 end
 
 # Returns a list of read environment variables in a hash based
@@ -23,6 +24,12 @@ if ARGV.count < 2
   usage 
 end
 
+# do not deploy if a pull request is tested
+unless TravisCustomDeploy::Options.deploy_allowed?
+  puts 'Deployment not allowed for pull requests.'
+  exit 0
+end
+
 transfer_type = ARGV[0]
 files = ARGV[1..-1]
 

data/lib/travis-custom-deploy/options.rb

@@ -47,5 +47,18 @@ module TravisCustomDeploy
       end
       nil
     end
+
+    # Returns true if travis-custom-deploy is not invoked as part of a pull
+    # request. The deployment would fail anyway if secure environment
+    # variables are used.
+    #
+    # Returns true if the deployment is allowed.
+    def self.deploy_allowed?
+      allowed = ENV['TRAVIS_PULL_REQUEST']
+      unless allowed.nil?
+        return false if allowed != "false"
+      end
+      true
+    end
   end
 end

data/lib/travis-custom-deploy/transfer/sftp.rb

@@ -14,24 +14,24 @@ module TravisCustomDeploy
       end
 
       def transfer
-        Net::SFTP.start(@options['host'], @options['username'], 
-                        :password => @options['password']) do |sftp|
-
+        Net::SFTP.start(@options['host'], @options['username'], :password => @options['password']) do |sftp|
           for e in @files
             if File.directory?(e)
               send_dir(sftp, e, @remotedir)
+            else
+              sftp.upload!(e, @remotedir + "/" + File.basename(e))
             end
           end
         end
       end
 
+      # Check if the passed arguments are sufficient
       def check_options(options)
         raise ArgumentError, 'host name must not be nil' if options['host'].nil?
         raise ArgumentError, 'userna)e must not be nil' if options['username'].nil?
         raise ArgumentError, 'password must not be nil' if options['password'].nil?
       end
 
-
       # Sends a directory to the remote server with the given parameters
       #
       # sftp - the SFTP connection
@@ -39,18 +39,15 @@ module TravisCustomDeploy
       # the remote folder where to place the files
       def send_dir(sftp, dir, remote)
         Dir.foreach(dir) do |file_name|
-
           next if file_name =~ /^(\.|\.\.)$/
 
           localfile = File.join(dir, file_name)
           if File.directory?(localfile)
-
             begin 
               sftp.mkdir!(remote + "/" + file_name)
             rescue Net::SFTP::StatusException
               # the directory probably already exists
             end
-
             send_dir(sftp, File.join(dir, file_name), File.join(remote, file_name))
           else
             sftp.upload!(File.join(dir, file_name), File.join(remote, file_name))

data/lib/travis-custom-deploy/version.rb

@@ -1,5 +1,5 @@
 module TravisCustomDeploy
 
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 
 end

data/test/test_options.rb

@@ -13,5 +13,35 @@ class TestOptions < Test::Unit::TestCase
         assert_equal ['host', 'username', 'password', 'remotedir'], @env
       end
     end
+
+    context "no pull request variable" do
+      setup do
+        ENV['TRAVIS_PULL_REQUEST'] = nil
+      end
+
+      should "allow deployment" do
+        assert_equal true, Options::deploy_allowed?
+      end
+    end
+
+    context "pull request variable false" do
+      setup do
+        ENV['TRAVIS_PULL_REQUEST'] = "false"
+      end
+
+      should "allow deployment" do
+        assert_equal true, Options::deploy_allowed?
+      end
+    end
+
+    context "pull request variable with number" do
+      setup do
+        ENV['TRAVIS_PULL_REQUEST'] = "1000"
+      end
+
+      should "don't allow deployment" do
+        assert_equal false, Options::deploy_allowed?
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-custom-deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jens Nazarenus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-sftp