deplomat 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67aed2b09a78c6ff894531f065ba7db0bdc60e20
-  data.tar.gz: 848f9cba73c651699f2496b5b871448fbc15fcb6
+  metadata.gz: 19c9e18dffd7b609ac6fa97ed1dfba3657dac02f
+  data.tar.gz: 56669fbf77b52f128336a5e2195df31bfc12dc9f
 SHA512:
-  metadata.gz: 7723cc145303719df54eb436a43a012b02e5180ab8fc56d08d121fe3ec1ed6a4b1fffa8befa7dd4d4cb22db0178e9d214e480b4884a062ebe4b5a42357f1eb2e
-  data.tar.gz: 6298c99481b28878c15763b0aeed01e99697c3621a677f35027cedb50410f9faaae0ab4f526e753be48d6741acbedd56f214d56f8c3422eef3c3252be32684d3
+  metadata.gz: 9aab773fa6a23eb5025dcd73bc83ab614d1c4e4c463bd436e3ed42d20ca81625abb9c25ff65be28b8c04b8f0b19815ffc5123726c5cb11c0140139a8378f333c
+  data.tar.gz: 3264cff003a6f8b327e98a516d97ee49b51aa8753035e003bacfbb42664b6844cf21cf0920f4aa487c52e369fbc95f638b941696d8e4bfa134d998e144b59fa9

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/deplomat.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: deplomat 0.1.1 ruby lib
+# stub: deplomat 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "deplomat"
-  s.version = "0.1.1"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Roman Snitko"]
-  s.date = "2016-07-05"
+  s.date = "2017-04-12"
   s.description = "Stack agnostic deployment system that uses bash and ssh commands"
   s.email = "roman.snitko@gmail.com"
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "deplomat.gemspec",
     "examples/simple_deploy.rb",
     "lib/deplomat.rb",
     "lib/deplomat/directives.rb",
@@ -38,6 +39,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/cleaning/.keep",
     "spec/fixtures/dir1/file1",
     "spec/fixtures/dir1/file2",
+    "spec/fixtures/upload1/except1",
     "spec/fixtures/upload1/uploaded_file1",
     "spec/fixtures/upload1/uploaded_file2",
     "spec/local_node_spec.rb",

data/lib/deplomat/local_node.rb

@@ -2,6 +2,10 @@ module Deplomat
 
   class LocalNode < Node
 
+    def initialize(logfile: "#{Dir.pwd}/deplomat.log", log_to: [:stdout], path: Dir.pwd, raise_exceptions: true)
+      super
+    end
+
     private
 
       def path_exist?(path)

data/lib/deplomat/node.rb

@@ -5,9 +5,11 @@ module Deplomat
     attr_accessor :log_to, :raise_exceptions, :logfile
     attr_reader   :current_path
 
-    def initialize(logfile: "#{Dir.pwd}/deplomat.log", log_to: [:stdout])
-      @log_to  = log_to
-      @logfile = logfile
+    def initialize(logfile: "#{Dir.pwd}/deplomat.log", log_to: [:stdout], path: nil, raise_exceptions: true)
+      @log_to           = log_to
+      @logfile          = logfile
+      @raise_exceptions = raise_exceptions
+      self.cd(path) if path
     end
 
     def execute(command, path=@current_path, message: [], stdout_source: :stdout, log_command: true)
@@ -45,7 +47,7 @@ module Deplomat
           log(error_out + "\n", color: 'red')
           if @raise_exceptions
             self.close if self.respond_to?(:close)
-            raise Deplomat::ExecutionError 
+            raise Deplomat::ExecutionError
           end
         end
         yield if block_given?
@@ -99,7 +101,7 @@ module Deplomat
     end
 
     def git_push(remote="origin", branch="master")
-      execute("git push -u #{remote} #{branch}")
+      execute("git push #{remote} #{branch}")
     end
 
     def git_pull(remote="origin", branch="master")
@@ -126,13 +128,13 @@ module Deplomat
       entries_by_date.each { |entry| remove("#{path}#{entry}") }
     end
 
-    private
+    def log(line, color: 'light_black')
+      @message_color = color
+      # Only calls log methods mentioned in the @log_to property
+      @log_to.each { |logger| self.send("log_to_#{logger}", line) }
+    end
 
-      def log(line, color: 'light_black')
-        @message_color = color
-        # Only calls log methods mentioned in the @log_to property
-        @log_to.each { |logger| self.send("log_to_#{logger}", line) }
-      end
+    private
 
       def log_to_file(line)
         if @logfile

data/lib/deplomat/remote_node.rb

@@ -1,8 +1,8 @@
 module Deplomat
   class RemoteNode < Node
 
-    def initialize(host:, port: 22, user: "deploy")
-      super()
+    def initialize(host:, port: 22, user: "deploy", raise_exceptions: true)
+      super(logfile: '~/deplomat.log')
 
       # Create ControlMasters dir, user might not have it
       unless File.exists?("#{ENV['HOME']}/.ssh/controlmasters/")
@@ -30,16 +30,17 @@ module Deplomat
     end
 
     alias :local_execute :execute
-    def execute(command, path=@current_path, message: [], env_vars: '', login_shell: false, stdout_source: :stdout)
+    def execute(command, path=@current_path, message: [], env_vars: '', login_shell: false, stdout_source: :stdout, log_command: true)
 
-      log("(#{@host}) --> " + command + "\n", color: "white")
+      log("(#{@host}) --> " + command + "\n", color: "white") if log_command
       command = "#{env_vars} cd #{path} && #{command}"  if path
       command = "bash -l -c \"#{command}\"" if login_shell
       super("#{@ssh_command} '#{command}'", nil, message: message, stdout_source: stdout_source, log_command: false)
     end
 
-    def upload(what, where)
-      local_execute "rsync -arz #{what} #{@user}@#{@host}:#{where} --port=#{@port}"
+    def upload(what, where, except: nil)
+      except = "--exclude '#{except}'" if except
+      local_execute "rsync -arzve 'ssh -p #{@port}' #{except} --delete #{what} #{@user}@#{@host}:#{where}", nil
     end
 
     def close
@@ -56,7 +57,7 @@ module Deplomat
       def path_exist?(path)
         old_raise_exceptions = @raise_exceptions
         @raise_exceptions    = false
-        !(execute("ls #{path}", nil){ @raise_exceptions = old_raise_exceptions}[:status] > 0)
+        !(execute("ls #{path}", nil, log_command: false){ @raise_exceptions = old_raise_exceptions}[:status] > 0)
       end
 
   end

data/spec/remote_node_spec.rb

@@ -48,8 +48,9 @@ describe Deplomat::RemoteNode do
     end
 
     it "uploads files from localhost to the node" do
-      @node.upload("#{@local_fixtures_dir}/upload1/*", "#{@fixtures_dir}/uploaded1/")
+      @node.upload("#{@local_fixtures_dir}/upload1/*", "#{@fixtures_dir}/uploaded1/", except: 'except1')
       expect(@node.execute("ls #{@fixtures_dir}/uploaded1/")[:out]).to have_files("uploaded_file1", "uploaded_file2")
+      expect(@node.execute("ls #{@fixtures_dir}/uploaded1/")[:out]).to not_have_files("except1")
     end
 
     it "changes current directory" do
@@ -81,6 +82,12 @@ describe Deplomat::RemoteNode do
       expect(@node.execute("ls dir1")[:out]).to have_files("file1", "file2", "subdir1")
     end
 
+    it "doesn't log ls command when checking if folder exists in `cd`" do
+      expect(@node).to receive(:log).with("(deplomat-test-node) --> ls /home/deploy/deplomat/dir2\n", { color: "white"}).exactly(0).times
+      @node.cd("#{@fixtures_dir}/dir2")
+      allow(@node).to receive(:log)
+    end
+
   end
 
   describe "handling status and errors" do

data/spec/spec_helper.rb

@@ -15,3 +15,17 @@ RSpec::Matchers.define :have_files do |*expected|
     "expected these files in the directory:\n\t#{actual.split("\n").inspect}\nwould include all of these:\n\t#{expected.inspect}"
   end
 end
+
+RSpec::Matchers.define :not_have_files do |*expected|
+  match do |actual|
+    actual = actual.split("\n")
+    actual.pop if actual.last == ""
+    expected.each do |e|
+      return false if actual.include?(e)
+    end
+    true
+  end
+  failure_message do |actual|
+    "expected these files in the directory:\n\t#{actual.split("\n").inspect}\nwould NOT include any of these:\n\t#{expected.inspect}"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deplomat
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
@@ -108,6 +108,7 @@ files:
 - spec/fixtures/cleaning/.keep
 - spec/fixtures/dir1/file1
 - spec/fixtures/dir1/file2
+- spec/fixtures/upload1/except1
 - spec/fixtures/upload1/uploaded_file1
 - spec/fixtures/upload1/uploaded_file2
 - spec/local_node_spec.rb