deplomat 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19c9e18dffd7b609ac6fa97ed1dfba3657dac02f
-  data.tar.gz: 56669fbf77b52f128336a5e2195df31bfc12dc9f
+  metadata.gz: dde00e6d13b40e55c1da3dec35d12123cd524434
+  data.tar.gz: 0de6af01c6d1e4be9f207246db8775489743f0ab
 SHA512:
-  metadata.gz: 9aab773fa6a23eb5025dcd73bc83ab614d1c4e4c463bd436e3ed42d20ca81625abb9c25ff65be28b8c04b8f0b19815ffc5123726c5cb11c0140139a8378f333c
-  data.tar.gz: 3264cff003a6f8b327e98a516d97ee49b51aa8753035e003bacfbb42664b6844cf21cf0920f4aa487c52e369fbc95f638b941696d8e4bfa134d998e144b59fa9
+  metadata.gz: edc64328013f3783e9ab4fb0469848b38a216b8ae525587b525142d9a7b6f98e4a8a83592dba8f5a92e36a9ca9682543c1a762ab29964132b2fd1d17fabb183c
+  data.tar.gz: c1a84e27eb85e34c1467c76a7f645e2fa70bd8c6fcb220f85fc477cee9e1fd9620c9a9f3fc3c9bbf0bb61b701e28f717b71ef50f2d9ff98518daac065af6e1a5

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.4.0)
-    builder (3.2.2)
+    builder (3.2.3)
     colorize (0.7.7)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -10,43 +10,44 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     git (1.3.0)
-    github_api (0.13.1)
+    github_api (0.16.0)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
-      multi_json (>= 1.7.5, < 2.0)
-      oauth2
-    hashie (3.4.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (3.5.6)
     highline (1.7.8)
-    jeweler (2.1.1)
+    jeweler (2.3.7)
       builder
-      bundler (>= 1.0)
+      bundler (>= 1)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-      semver
-    json (1.8.3)
-    jwt (1.5.1)
-    mini_portile2 (2.0.0)
-    multi_json (1.11.3)
-    multi_xml (0.5.5)
+      semver2
+    jwt (1.5.6)
+    mime-types (2.99.3)
+    mini_portile2 (2.3.0)
+    multi_json (1.12.2)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    oauth2 (1.1.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    rack (1.6.4)
-    rake (11.1.2)
-    rdoc (4.2.2)
-      json (~> 1.4)
+    psych (2.2.4)
+    rack (2.0.3)
+    rake (12.3.0)
+    rdoc (5.1.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -60,9 +61,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    semver (1.0.1)
+    semver2 (3.4.2)
     sys-proctable (1.0.0)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
 
 PLATFORMS
   ruby
@@ -75,4 +76,4 @@ DEPENDENCIES
   sys-proctable
 
 BUNDLED WITH
-   1.12.0
+   1.16.0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.5

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.3 ruby lib
+# stub: deplomat 0.1.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "deplomat"
-  s.version = "0.1.3"
+  s.version = "0.1.5"
 
   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 = "2017-04-12"
+  s.date = "2017-11-19"
   s.description = "Stack agnostic deployment system that uses bash and ssh commands"
   s.email = "roman.snitko@gmail.com"
   s.extra_rdoc_files = [

data/lib/deplomat/local_node.rb

@@ -6,12 +6,6 @@ module Deplomat
       super
     end
 
-    private
-
-      def path_exist?(path)
-        File.exist?(path)
-      end
-
   end
 
 end

data/lib/deplomat/node.rb

@@ -12,7 +12,7 @@ module Deplomat
       self.cd(path) if path
     end
 
-    def execute(command, path=@current_path, message: [], stdout_source: :stdout, log_command: true)
+    def execute(command, path=@current_path, message: [], stdout_source: :stdout, log_command: true, _raise_exceptions: @raise_exceptions)
 
       message = [message] if message.kind_of?(String)
       log(message[0] + "\n", color: 'white') unless message.empty? || message.nil?
@@ -35,7 +35,7 @@ module Deplomat
         log("--> " + command_to_log + "\n", color: "white") if log_command
         while line=stdout_source_object.gets do 
           out << line
-          log("  #{line}")
+          log("  #{line}") if log_command
         end
 
         error_out = ""
@@ -45,7 +45,7 @@ module Deplomat
             error_out += o
           end
           log(error_out + "\n", color: 'red')
-          if @raise_exceptions
+          if _raise_exceptions
             self.close if self.respond_to?(:close)
             raise Deplomat::ExecutionError
           end
@@ -88,13 +88,22 @@ module Deplomat
     end
     alias :ln :create_symlink
 
+    def path_exist?(path)
+      execute("[ -e #{path} ]", @current_path, _raise_exceptions: true) && true
+    rescue Deplomat::ExecutionError # returned 1, file doesn't exist
+      false
+    end
+    alias :path_exists? :path_exist?
+    alias :file_exists? :path_exist?
+
     def cd(path)
+      raise Deplomat::NoSuchPathError, path if !path.nil? && !path_exist?(path)
+
       @current_path = if path =~ /\A[\/~]/ || path.nil?
         path
       else
         File.expand_path("#{@current_path}#{path}")
       end
-      raise Deplomat::NoSuchPathError, @current_path if !@current_path.nil? && !path_exist?(@current_path)
 
       # Making sure we don't end up with double // at the end of the path
       @current_path = @current_path.chomp("/") + "/"
@@ -118,7 +127,7 @@ module Deplomat
 
     def clean(path: @current_path, except: [], leave: [0, :last])
       # Gets us all entries sorted by date, most recent ones first
-      entries_by_date = execute("ls -t", path)[:out].split("\n")
+      entries_by_date = execute("ls -t", path, log_command: false)[:out].split("\n")
       # Don't do anything with entries listed in :except
       entries_by_date = entries_by_date - except
       if leave

data/lib/deplomat/remote_node.rb

@@ -30,12 +30,12 @@ module Deplomat
     end
 
     alias :local_execute :execute
-    def execute(command, path=@current_path, message: [], env_vars: '', login_shell: false, stdout_source: :stdout, log_command: true)
+    def execute(command, path=@current_path, message: [], env_vars: '', login_shell: false, stdout_source: :stdout, log_command: true, _raise_exceptions: @raise_exceptions)
 
       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)
+      super("#{@ssh_command} '#{command}'", nil, message: message, stdout_source: stdout_source, log_command: false, _raise_exceptions: _raise_exceptions)
     end
 
     def upload(what, where, except: nil)
@@ -52,13 +52,5 @@ module Deplomat
       end
     end
 
-    private
-
-      def path_exist?(path)
-        old_raise_exceptions = @raise_exceptions
-        @raise_exceptions    = false
-        !(execute("ls #{path}", nil, log_command: false){ @raise_exceptions = old_raise_exceptions}[:status] > 0)
-      end
-
   end
 end

data/spec/node_spec.rb

@@ -2,12 +2,20 @@ require 'spec_helper'
 
 describe Deplomat::Node do
 
-  describe "logging" do
+  before(:each) do
+    @fixtures_dir = Dir.pwd + "/spec/fixtures"
+    @node = Deplomat::Node.new(logfile: "#{@fixtures_dir}/deplomat.log", log_to: [:file, :stdout])
+  end
 
-    before(:each) do
-      @fixtures_dir = Dir.pwd + "/spec/fixtures"
-      @node = Deplomat::Node.new(logfile: "#{@fixtures_dir}/deplomat.log", log_to: [:file, :stdout])
-    end
+  it "checks if file exists" do
+    expect(@node.file_exists?("#{@fixtures_dir}/existing_file.txt")).to be_falsey
+    expect(@node.file_exists?("/non-existent-path")).to be_falsey
+    FileUtils.touch("#{@fixtures_dir}/existing_file.txt")
+    expect(@node.file_exists?("#{@fixtures_dir}/existing_file.txt")).to be_truthy
+    FileUtils.rm("#{@fixtures_dir}/existing_file.txt")
+  end
+
+  describe "logging" do
 
     after(:each) do
       @node.log_to = []
@@ -28,7 +36,7 @@ describe Deplomat::Node do
 
     it "puts additional messages into the terminal when required" do
       expect($stdout).to receive(:print).once.with("hello\n".white)
-      expect($stdout).to receive(:print).once.with("--> ls /home/roman/Dropbox/Work/my_libs/deplomat/spec/fixtures/dir1\n".white)
+      expect($stdout).to receive(:print).once.with("--> ls #{@fixtures_dir}/dir1\n".white)
       expect($stdout).to receive(:print).once.with("  file1\n".light_black)
       expect($stdout).to receive(:print).once.with("  file2\n".light_black)
       expect($stdout).to receive(:print).once.with("  subdir1\n".light_black)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deplomat
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable