deplomat 0.2.10 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66ae898f5e989d5a0d75e1bc1553c4b5fbf0b72985f56d567196b45245a29e34
-  data.tar.gz: 7997c279e5efa60157e363a9f2a364652ab63d9043cdd4776d46518d9e9adc43
+  metadata.gz: 301c757dcdfde3f2c5bde5daf7ceaf2581709be76231b0969baa578d2916ec32
+  data.tar.gz: e8bf99ba3c523b75f0dcb06bae5455db378e80c11811bd85653a4561f8b77d1b
 SHA512:
-  metadata.gz: 7e39f88db17fb163497d22f7df5e1852d4400d2cf7cf4fe95e8d17a7adaf79763bfff8d871ba3504f84a43077510fb2d92168c8980e6aba6169349476768d370
-  data.tar.gz: bc9bb50fa861aeedb8e5ca8efdebeefa7b0172beb0a46eca85e4541e35dbe7d8981603918a159bc22a3453b2c38626b78938ac75c8611b0bb5f129cf5cc38090
+  metadata.gz: d3ca06828195db4330077d72565efc27a9106c263737e3785081aed8822ea2e1d246de7450b936ae82052ab9dc6ab67ad56e5b9de512c6f2d573b0171169361f
+  data.tar.gz: ee42d1816c86ca3f968509f3633dd5892cea9b98b0281700c69ce8d37ba302c55a94d069bc0ebdd72f0528175b90dc5ca421a8979238936aa30cadaa8544e929

data/.gitignore

@@ -0,0 +1,18 @@
+# rcov generated
+coverage
+coverage.data
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+spec/fixtures/git_repo

data/Gemfile

@@ -1,10 +1,3 @@
 source "http://rubygems.org"
 
-gem "sys-proctable"
-gem "colorize"
-
-group :development do
-  gem "bundler", "~> 1.0"
-  gem "jeweler"
-  gem "rspec"
-end
+gemspec

data/Gemfile.lock

@@ -1,81 +1,39 @@
+PATH
+  remote: .
+  specs:
+    Deplomat (0.2.13)
+      colorize
+      sys-proctable
+
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.4.0)
-    builder (3.2.3)
     colorize (0.8.1)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.25)
-    git (1.4.0)
-    github_api (0.16.0)
-      addressable (~> 2.4.0)
-      descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      mime-types (>= 1.16, < 3.0)
-      oauth2 (~> 1.0)
-    hashie (3.5.7)
-    highline (1.7.10)
-    jeweler (2.3.9)
-      builder
-      bundler
-      git (>= 1.2.5)
-      github_api (~> 0.16.0)
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
-      psych
-      rake
-      rdoc
-      semver2
-    jwt (1.5.6)
-    mime-types (2.99.3)
-    mini_portile2 (2.3.0)
-    multi_json (1.13.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nokogiri (1.8.2)
-      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)
-    psych (3.0.2)
-    rack (2.0.6)
-    rake (12.3.1)
-    rdoc (6.0.4)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    ffi (1.12.2)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.2)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    semver2 (3.4.2)
-    sys-proctable (1.2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
+    sys-proctable (1.2.2)
       ffi
-    thread_safe (0.3.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0)
-  colorize
-  jeweler
+  Deplomat!
+  bundler (~> 2.0)
   rspec
-  sys-proctable
 
 BUNDLED WITH
-   1.16.1
+   2.0.2

data/LICENSE.txt

@@ -1,5 +1,3 @@
-Copyright (c) 2016 Roman Snitko
-
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.15

data/deplomat.gemspec

@@ -1,83 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: deplomat 0.2.10 ruby lib
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-Gem::Specification.new do |s|
-  s.name = "deplomat".freeze
-  s.version = "0.2.10"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib".freeze]
-  s.authors = ["Roman Snitko".freeze]
-  s.date = "2019-06-16"
-  s.description = "Stack agnostic deployment system that uses bash and ssh commands".freeze
-  s.email = "roman.snitko@gmail.com".freeze
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "deplomat.gemspec",
-    "examples/simple_deploy.rb",
-    "lib/deplomat.rb",
-    "lib/deplomat/directives.rb",
-    "lib/deplomat/exceptions.rb",
-    "lib/deplomat/local_node.rb",
-    "lib/deplomat/node.rb",
-    "lib/deplomat/remote_node.rb",
-    "spec/deployment_requisites/1_req.rb",
-    "spec/deployment_requisites/2_req.rb",
-    "spec/deployment_requisites/not_a_task.rb",
-    "spec/directives_spec.rb",
-    "spec/fixtures/.deployment_requisites_counter",
-    "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",
-    "spec/node_spec.rb",
-    "spec/remote_node_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/snitko/deplomat".freeze
-  s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.7.6".freeze
-  s.summary = "Stack agnostic deployment system that uses bash and ssh commands".freeze
+Gem::Specification.new do |spec|
+  spec.name = "deplomat"
+  spec.description = "Stack agnostic deployment system that uses bash and ssh commands".freeze
+  spec.summary = "Deplomat".freeze
+  spec.homepage = "https://gitlab.com/hodlhodl-public/deplomat"
+  spec.license = "MIT"
+  spec.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if spec.respond_to? :required_rubygems_version=
+  spec.require_paths = ["lib".freeze]
+  spec.authors = ["romanitup".freeze]
+  spec.extra_rdoc_files = [ "LICENSE.txt", "README.md"]
+  spec.version = File.readlines(File.expand_path(File.dirname(__FILE__)) + "/VERSION")[0]
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  spec.add_dependency "colorize"
+  spec.add_dependency "sys-proctable"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sys-proctable>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<colorize>.freeze, [">= 0"])
-      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<sys-proctable>.freeze, [">= 0"])
-      s.add_dependency(%q<colorize>.freeze, [">= 0"])
-      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
-      s.add_dependency(%q<rspec>.freeze, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<sys-proctable>.freeze, [">= 0"])
-    s.add_dependency(%q<colorize>.freeze, [">= 0"])
-    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
-    s.add_dependency(%q<rspec>.freeze, [">= 0"])
-  end
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rspec"
 end
-

data/lib/deplomat/directives.rb

@@ -66,14 +66,14 @@ def load_requisites!(counter, requisites_path: "#{Dir.pwd}/deployment_requisites
   log_requisites_count = "Checking #{requisites_path} dir for requisites..."
   files = Dir["#{requisites_path}/*.rb"].map do |fn|
     number = fn.split("/").last.match(/\A\d+_/).to_a.first&.chomp("_")
-    number ? [number, fn] : nil
+    number ? [number.to_i, fn] : nil
   end
 
   if files
     files = files.compact               # ignore files that don't start with a number
     .sort { |x,y| x.first <=> y.first } # Sort files according to the number in front of their names
     .map { |fn| fn.last }               # lose the folded Array we used to store the consecutive requisite number
-    .slice(counter..-1)                 # lose files whose consecutive requisite number is below or equals the counter
+    .slice(counter..-1)               # lose files whose consecutive requisite number is below or equals the counter
   end
 
   if files && files.size > 0
@@ -85,7 +85,7 @@ def load_requisites!(counter, requisites_path: "#{Dir.pwd}/deployment_requisites
   else
     log_requisites_count += "no files found"
   end
-  log << log_requisites_count
+  log.unshift log_requisites_count
 
   return { counter: (files ? (counter + files.size) : 0), log: log }
 

data/lib/deplomat/node.rb

@@ -2,8 +2,17 @@ module Deplomat
 
   class Node
 
-    attr_accessor :log_to, :raise_exceptions, :logfile
+    attr_accessor :log_to, :raise_exceptions, :logfile, :wrap_in
     attr_reader   :current_path
+    attr_writer   :stdout_lines_to_ignore
+
+    def stdout_lines_to_ignore
+      if @stdout_lines_to_ignore.kind_of?(Array)
+        @stdout_lines_to_ignore
+      else
+        [@stdout_lines_to_ignore]
+      end.compact
+    end
 
     def initialize(logfile: "#{Dir.pwd}/deplomat.log", log_to: [:stdout], path: nil, raise_exceptions: true)
       @log_to           = log_to
@@ -14,13 +23,18 @@ module Deplomat
 
     def execute(command, path=@current_path, message: [], stdout_source: :stdout, log_command: true, _raise_exceptions: @raise_exceptions)
 
+      original_command = command
+      if @wrap_in
+        command = @wrap_in.sub("_command_", command)
+      end
+
       message = [message] if message.kind_of?(String)
       log(message[0] + "\n", color: 'white') unless message.empty? || message.nil?
 
       # Respect current_path
-      command_to_log = command
+      command_to_log = original_command
       if path
-        command_to_log = "#{command}\n(in #{path})"
+        command_to_log = "#{original_command}\n(in #{path})"
         command = "cd #{path} && #{command}"
       end
 
@@ -30,12 +44,19 @@ module Deplomat
 
         # Sometimes, programs write in stderr, although there are no errors.
         # rake assets:precompile does that, for example.
-        stdout_source_object = (stdout_source == :stderr ? stderr : stdout) 
+        stdout_source_object = (stdout_source == :stderr ? stderr : stdout)
 
         log("--> " + command_to_log + "\n", color: "white") if log_command
-        while line=stdout_source_object.gets do 
-          out << line
-          log("  #{line}") if log_command
+        stdout_source_object.readlines.each_with_index do |line, i|
+          self.stdout_lines_to_ignore.each do |line_to_ignore|
+            line_to_ignore = line_to_ignore.to_a if line_to_ignore.kind_of?(Range)
+            line_to_ignore = [line_to_ignore]    if line_to_ignore.kind_of?(Integer)
+            line = nil if line_to_ignore.include?(i+1)
+          end
+          if line
+            out << line
+            log("  #{line}") if log_command
+          end
         end
 
         error_out = ""

data/lib/deplomat/remote_node.rb

@@ -24,8 +24,7 @@ module Deplomat
       end
       @pids.compact!
       if @pids.empty?
-        log("ERROR: no ssh pid found for\n\t#{first_ssh_command}.\nThis is weird.", color: "red")
-        exit 1
+        raise Deplomat::ExecutionError.new("ERROR: no ssh pid found for\n\t#{first_ssh_command}.\nThis is weird.")
       elsif @pids.length > 1
         log("Connected with ssh, host #{host}, but looks like another connection has been opened before...", color: "white")
         log("connection pids: #{@pids.join(", ")}. We'll be closing them all when finished.", color: "white")

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: deplomat
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.15
 platform: ruby
 authors:
-- Roman Snitko
+- romanitup
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-16 00:00:00.000000000 Z
+date: 2020-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sys-proctable
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: sys-proctable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -44,28 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  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'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Stack agnostic deployment system that uses bash and ssh commands
-email: roman.snitko@gmail.com
+email: 
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -89,12 +75,12 @@ extra_rdoc_files:
 - README.md
 files:
 - ".document"
+- ".gitignore"
 - ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
-- Rakefile
 - VERSION
 - deplomat.gemspec
 - examples/simple_deploy.rb
@@ -104,22 +90,7 @@ files:
 - lib/deplomat/local_node.rb
 - lib/deplomat/node.rb
 - lib/deplomat/remote_node.rb
-- spec/deployment_requisites/1_req.rb
-- spec/deployment_requisites/2_req.rb
-- spec/deployment_requisites/not_a_task.rb
-- spec/directives_spec.rb
-- spec/fixtures/.deployment_requisites_counter
-- 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
-- spec/node_spec.rb
-- spec/remote_node_spec.rb
-- spec/spec_helper.rb
-homepage: http://github.com/snitko/deplomat
+homepage: https://gitlab.com/hodlhodl-public/deplomat
 licenses:
 - MIT
 metadata: {}
@@ -138,9 +109,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Stack agnostic deployment system that uses bash and ssh commands
+summary: Deplomat
 test_files: []

data/Rakefile

@@ -1,25 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
-  gem.name = "deplomat"
-  gem.homepage = "http://github.com/snitko/deplomat"
-  gem.license = "MIT"
-  gem.summary = %Q{Stack agnostic deployment system that uses bash and ssh commands}
-  gem.description = %Q{Stack agnostic deployment system that uses bash and ssh commands}
-  gem.email = "roman.snitko@gmail.com"
-  gem.authors = ["Roman Snitko"]
-  # dependencies defined in Gemfile
-end

data/spec/deployment_requisites/1_req.rb

@@ -1,3 +0,0 @@
-before_task(:task1, 1) do
-  $deployment_requisites_test_file1 = true
-end

data/spec/deployment_requisites/2_req.rb

@@ -1,3 +0,0 @@
-before_task(:task2, 2) do
-  $deployment_requisites_test_file2 = true
-end

data/spec/directives_spec.rb

@@ -1,64 +0,0 @@
-require 'spec_helper'
-
-describe "directives" do
-
-  before(:each) do
-    $deplomat_tasks = []
-  end
-
-  it "executes arbitrary ruby code in a particular environment" do
-    $env = 'staging'
-    expect(self).to receive(:hello).exactly(1).times
-    execute_in(env: 'staging')    { hello() }
-    execute_in(env: 'production') { hello() }
-  end
-
-  it "creates a partial" do
-    partial("hello_partial") { hello() }
-    expect($partials["hello_partial"][:block]).to be_kind_of(Proc)
-  end
-
-  it "executes a partial" do
-    expect(self).to receive(:hello).with("hello").exactly(1).times
-    partial("hello_partial") { |args| hello(args[:x]) }
-    execute_partial "hello_partial", x: 'hello'
-  end
-
-  it "executes tasks consecutively, running before and after callbacks" do
-
-    $out = ""
-    def task1; $out += "task1"; end
-    def task2; $out += "task2"; end
-    def task3; $out += ",task3"; end
-    
-    before_task(:task1, 1) { $out += "before_task1:" }
-    after_task(:task1,  2) { $out += ":after_task1,"  }
-    before_task(:task2, 3) { $out += "before_task2:" }
-    after_task(:task2,  4) { $out += ":after_task2"  }
-    before_task(:task4, 5) { $out += "before_task4:" }
-    after_task(:task4,  6) { $out += ":after_task4"  }
-
-    add_task :task1, :task2, :task3
-
-    execute_tasks!
-    expect($out).to eq("before_task1:task1:after_task1,before_task2:task2:after_task2,task3")
-
-  end
-
-  it "loads and runs requisites" do
-
-    def task1;end
-    def task2;end
-
-    add_task :task1, :task2
-
-    result = load_requisites!(1, requisites_path: "#{File.expand_path(File.dirname(__FILE__))}/deployment_requisites")
-    expect(result[:counter]).to eq(2)
-    expect(result[:log].last).to eq("Loading requisite: 2_req.rb")
-    execute_tasks!
-    expect($deployment_requisites_test_file1).to be_nil
-    expect($deployment_requisites_test_file2).to be_truthy
-
-  end
-
-end

data/spec/fixtures/.deployment_requisites_counter

@@ -1 +0,0 @@
-1

data/spec/local_node_spec.rb

@@ -1,180 +0,0 @@
-require 'spec_helper'
-
-describe Deplomat::LocalNode do
-
-  before(:each) do
-    @fixtures_dir = Dir.pwd + "/spec/fixtures"
-    @localhost = Deplomat::LocalNode.new
-    @localhost.log_to = []
-    @localhost.raise_exceptions = false
-  end
-
-  after(:each) do
-    FileUtils.rm_r(Dir.glob("#{@fixtures_dir}/dir2/*"))
-  end
-
-  describe "filesystem operations" do
-
-    it "copies files to another folder" do
-      @localhost.copy("#{@fixtures_dir}/dir1/*", "#{@fixtures_dir}/dir2/")
-      expect(File.exist?("#{@fixtures_dir}/dir2/file1")).to be_truthy
-      expect(File.exist?("#{@fixtures_dir}/dir2/file2")).to be_truthy
-    end
-
-    it "moves files and dirs to another directory" do
-      @localhost.move("#{@fixtures_dir}/dir1/*", "#{@fixtures_dir}/dir2/")
-      expect(File.exist?("#{@fixtures_dir}/dir2/file1")).to be_truthy
-      expect(File.exist?("#{@fixtures_dir}/dir2/file2")).to be_truthy
-      expect(File.exist?("#{@fixtures_dir}/dir2/subdir1")).to be_truthy
-      expect(File.exist?("#{@fixtures_dir}/dir1/file1")).to be_falsy
-      expect(File.exist?("#{@fixtures_dir}/dir1/file2")).to be_falsy
-      expect(File.exist?("#{@fixtures_dir}/dir1/subdir1")).to be_falsy
-
-      @localhost.move("#{@fixtures_dir}/dir2/*", "#{@fixtures_dir}/dir1/")
-      expect(File.exist?("#{@fixtures_dir}/dir1/file1")).to be_truthy
-      expect(File.exist?("#{@fixtures_dir}/dir1/file2")).to be_truthy
-      expect(File.exist?("#{@fixtures_dir}/dir1/subdir1")).to be_truthy
-      expect(File.exist?("#{@fixtures_dir}/dir2/file1")).to be_falsy
-      expect(File.exist?("#{@fixtures_dir}/dir2/file2")).to be_falsy
-      expect(File.exist?("#{@fixtures_dir}/dir2/subdir1")).to be_falsy
-    end
-
-    it "removes files and dirs" do
-      @localhost.copy("#{@fixtures_dir}/dir1/*", "#{@fixtures_dir}/dir2/")
-      @localhost.remove("#{@fixtures_dir}/dir2/*")
-      expect(File.exist?("#{@fixtures_dir}/dir2/file1")).to be_falsy
-      expect(File.exist?("#{@fixtures_dir}/dir2/file2")).to be_falsy
-      expect(File.exist?("#{@fixtures_dir}/dir2/subdir1")).to be_falsy
-    end
-
-    it "changes current directory" do
-      @localhost.cd("/etc")
-      expect(@localhost.current_path).to eq("/etc/") 
-      expect(-> { @localhost.cd("/non-existent-path") }).to raise_exception(Deplomat::NoSuchPathError)
-    end
-
-    it "executes commands from the current directory" do
-      @localhost.cd("#{@fixtures_dir}/dir1")
-      expect(@localhost.execute("ls")[:out]).to eq("file1\nfile2\nsubdir1\n")
-    end
-
-    it "creates an empty file" do
-      @localhost.cd("#{@fixtures_dir}/dir2")
-      @localhost.touch("myfile")
-      expect(@localhost.execute("ls")[:out]).to have_files("myfile")
-    end
-
-    it "creates a directory" do
-      @localhost.cd("#{@fixtures_dir}/dir2")
-      @localhost.mkdir("mydir")
-      expect(@localhost.execute("ls")[:out]).to have_files("mydir")
-    end
-
-    it "creates a symlink" do
-      @localhost.cd("#{@fixtures_dir}/dir2")
-      @localhost.create_symlink("../dir1", "./")
-      expect(@localhost.execute("ls dir1")[:out]).to have_files("file1", "file2", "subdir1")
-    end
-
-  end
-
-  describe "handling status and errors" do
-
-    it "returns the status" do
-      expect(@localhost.execute("ls #{@fixtures_dir}/dir1/")[:status]).to eq(0)
-      expect(@localhost.execute("ls #{@fixtures_dir}/non-existent-dir/")[:status]).to eq(2)
-    end
-
-    it "raises execution error when command fails" do
-      @localhost.raise_exceptions = true
-      expect( -> { @localhost.execute("ls #{@fixtures_dir}/non-existent-dir/")[:status] }).to raise_exception(Deplomat::ExecutionError)
-    end
-
-  end
-
-  describe "cleaning" do
-
-    before(:each) do
-      @localhost.cd("#{@fixtures_dir}/cleaning")
-      @localhost.execute("touch file1 file2 file3")
-      @localhost.execute("mkdir current")
-      sleep(0.01)
-      @localhost.execute("mkdir dir1 dir2 dir3")
-    end
-
-    after(:each) do
-      @localhost.execute("rm -rf #{@fixtures_dir}/cleaning/*")
-    end
-
-    it "cleans all the files and dirs in a given directory" do
-      @localhost.clean
-      expect(@localhost.execute('ls')[:out]).to be_empty
-    end
-
-    it "cleans all but last 3 entries in a given directory" do
-      @localhost.clean(leave: [3, :last])
-      expect(@localhost.execute('ls')[:out]).to eq("dir1\ndir2\ndir3\n")
-    end
-
-    it "cleans all, but :except entries in a given directory" do
-      @localhost.clean(except: ["current"])
-      expect(@localhost.execute('ls')[:out]).to eq("current\n")
-    end
-
-  end
-
-  describe "git commands" do
-
-    before(:all) do
-      @fixtures_dir = Dir.pwd + "/spec/fixtures"
-      @localhost_git = Deplomat::LocalNode.new
-      @localhost_git.log_to = [:stdout]
-      @localhost_git.cd(@fixtures_dir)
-      @localhost_git.mkdir("git_repo")
-      @localhost_git.cd("git_repo")
-      @localhost_git.touch("file1")
-      @localhost_git.execute("git init && git add .")
-      @localhost_git.execute("git remote add origin deploy@deplomat-test-node:/home/deploy/deplomat/.git_repo")
-      @remote_node = Deplomat::RemoteNode.new(host: "deplomat-test-node", user: "deploy")
-      @remote_node.log_to = [:stdout]
-      @remote_node.execute("cd ~/deplomat && mkdir .git_repo && cd .git_repo && git --bare init")
-      @localhost_git.cd("#{@fixtures_dir}/git_repo")
-      @localhost_git.execute("git commit -m \"Initial commit\"")
-
-      @localhost_git.raise_exceptions = true
-      @remote_node.raise_exceptions   = true
-    end
-
-    after(:all) do
-      @remote_node.remove("~/deplomat/.git_repo")
-      @localhost_git.remove("#{@fixtures_dir}/git_repo")
-    end
-    
-    it "pushes to remote" do
-      expect(@localhost_git.git_push[:status]).to eq(0)
-    end
-
-    it "pulls from remote" do
-      expect(@localhost_git.git_pull[:status]).to eq(0)
-    end
-
-    it "merges branches" do
-      @localhost_git.execute("git checkout -b dev1")
-      @localhost_git.touch("file2")
-      @localhost_git.execute("git add . && git commit -m \"adding file2\"")
-      @localhost_git.execute("git checkout master")
-      expect(@localhost_git.git_merge("dev1", "master")[:status]).to eq(0)
-      expect(File.exist?("#{@fixtures_dir}/git_repo/file2")).to be_truthy
-    end
-
-    it "checks out into a branch" do
-      @localhost_git.execute("git branch dev2")
-      @localhost_git.touch("file3")
-      @localhost_git.execute("git add . && git commit -m \"adding file3\"")
-      @localhost_git.git_checkout("dev2")
-      expect(File.exist?("#{@fixtures_dir}/git_repo/file3")).to be_falsy
-    end
-
-  end
-
-end

data/spec/node_spec.rb

@@ -1,65 +0,0 @@
-require 'spec_helper'
-
-describe Deplomat::Node do
-
-  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 = []
-      @node.remove("#{@fixtures_dir}/deplomat.log")
-    end
-
-    it "logs to the stdout" do
-      expect($stdout).to receive(:print).exactly(4).times
-      @node.execute("ls #{@fixtures_dir}/dir1")
-    end
-
-    it "logs to a log file" do
-      @node.log_to = [:file]
-      @node.execute("ls #{@fixtures_dir}/dir1")
-      log = File.readlines("#{@fixtures_dir}/deplomat.log")
-      expect(log.size).to eq(4)
-    end
-
-    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 #{@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)
-      expect($stdout).to receive(:print).once.with("bye\n".white)
-      @node.execute("ls #{@fixtures_dir}/dir1", message: ["hello", "bye"])
-    end
-
-    it "updates requisite counter" do
-      @node.log_to = []
-
-      requisites_counter_fn = "#{Dir.pwd}/spec/.deployment_requisites_counter"
-      @node.cd Dir.pwd + "/spec"
-
-      File.open(requisites_counter_fn, "w") { |f| f.puts 1 }
-      @node.update_requisite_number!(2)
-      expect(File.readlines(requisites_counter_fn).first.to_i).to eq(2)
-
-      expect(-> { @node.update_requisite_number!(1) }).to raise_exception(SystemExit)
-
-      File.unlink(requisites_counter_fn)
-      expect(-> { @node.update_requisite_number!(3) }).to raise_exception(SystemExit)
-    end
-
-  end
-
-end

data/spec/remote_node_spec.rb

@@ -1,139 +0,0 @@
-require 'spec_helper'
-
-describe Deplomat::RemoteNode do
-
-  before(:all) do
-    @fixtures_dir       = "/home/deploy/deplomat"
-    @local_fixtures_dir = Dir.pwd + "/spec/fixtures"
-    @node = Deplomat::RemoteNode.new(host: "deplomat-test-node", user: "deploy")
-    @node.log_to = []
-  end
-
-  before(:each) do
-    @node.raise_exceptions = true
-  end
-
-  after(:all) do
-    @node.close
-  end
-
-  after(:each) do
-    @node.raise_exceptions = false
-    @node.execute("rm -rf #{@fixtures_dir}/dir2/*")
-    @node.execute("rm -rf #{@fixtures_dir}/uploaded1/*")
-    @node.execute("rm -rf #{@fixtures_dir}/uploaded2/*")
-  end
-
-  describe "filesystem operations" do
-
-    it "copies files to another folder" do
-      @node.copy("#{@fixtures_dir}/dir1/*", "#{@fixtures_dir}/dir2/")
-      expect(@node.execute("ls #{@fixtures_dir}/dir2/")[:out]).to have_files("file1", "file2", "subdir1")
-    end
-
-    it "moves files and dirs from one directory into another" do
-      @node.move("#{@fixtures_dir}/dir1/*", "#{@fixtures_dir}/dir2/")
-      expect(@node.execute("ls #{@fixtures_dir}/dir1/")[:out]).to eq("")
-      expect(@node.execute("ls #{@fixtures_dir}/dir2/")[:out]).to have_files("file1", "file2", "subdir1")
-      @node.move("#{@fixtures_dir}/dir2/*", "#{@fixtures_dir}/dir1/")
-      expect(@node.execute("ls #{@fixtures_dir}/dir2/")[:out]).to eq("")
-      expect(@node.execute("ls #{@fixtures_dir}/dir1/")[:out]).to have_files("file1", "file2", "subdir1")
-    end
-
-    it "removes files and dirs" do
-      @node.copy("#{@fixtures_dir}/dir1/*", "#{@fixtures_dir}/dir2/")
-      expect(@node.execute("ls #{@fixtures_dir}/dir2/")[:out]).to have_files("file1", "file2", "subdir1")
-      @node.remove("#{@fixtures_dir}/dir2/*")
-      expect(@node.execute("ls #{@fixtures_dir}/dir2/")[:out]).to eq("")
-    end
-
-    it "uploads files from localhost to the node" do
-      @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
-      #@node.cd("/etc")
-      #expect(@node.current_path).to eq("/etc/") 
-      expect(-> { @node.cd("/non-existent-path") }).to raise_exception(Deplomat::NoSuchPathError)
-    end
-
-    it "executes commands from the current directory" do
-      @node.cd("#{@fixtures_dir}/dir1")
-      expect(@node.execute("ls")[:out]).to have_files("file1", "file2", "subdir1")
-    end
-
-    it "creates an empty file" do
-      @node.cd("#{@fixtures_dir}/dir2")
-      @node.touch("myfile")
-      expect(@node.execute("ls")[:out]).to have_files("myfile")
-    end
-
-    it "creates a directory" do
-      @node.cd("#{@fixtures_dir}/dir2")
-      @node.mkdir("mydir")
-      expect(@node.execute("ls")[:out]).to have_files("mydir")
-    end
-
-    it "creates a symlink" do
-      @node.cd("#{@fixtures_dir}/dir2")
-      @node.create_symlink("../dir1", "./")
-      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
-
-    it "returns the status" do
-      @node.raise_exceptions = false
-      expect(@node.execute("ls #{@fixtures_dir}/dir1/")[:status]).to eq(0)
-      expect(@node.execute("ls #{@fixtures_dir}/non-existent-dir/")[:status]).to eq(2)
-    end
-
-    it "raises execution error when command fails" do
-      @node.raise_exceptions = true
-      expect( -> { @node.execute("ls #{@fixtures_dir}/non-existent-dir/")[:status] }).to raise_exception(Deplomat::ExecutionError)
-    end
-
-  end
-
-  describe "cleaning" do
-
-    before(:each) do
-      @node.cd("#{@fixtures_dir}/cleaning")
-      @node.execute("touch file1 file2 file3")
-      @node.execute("mkdir current")
-      sleep(0.01)
-      @node.execute("mkdir dir1 dir2 dir3")
-    end
-
-    after(:each) do
-      @node.execute("rm -rf #{@fixtures_dir}/cleaning/*")
-    end
-
-    it "cleans all the files and dirs in a given directory" do
-      @node.clean
-      expect(@node.execute('ls')[:out]).to be_empty
-    end
-
-    it "cleans all but last 3 entries in a given directory" do
-      @node.clean(leave: [3, :last])
-      expect(@node.execute('ls')[:out]).to eq("dir1\ndir2\ndir3\n")
-    end
-
-    it "cleans all, but :except entries in a given directory" do
-      @node.clean(except: ["current"])
-      expect(@node.execute('ls')[:out]).to eq("current\n")
-    end
-
-  end
-
-end

data/spec/spec_helper.rb

@@ -1,31 +0,0 @@
-require 'rspec/expectations'
-require "fileutils"
-require_relative "../lib/deplomat"
-
-RSpec::Matchers.define :have_files do |*expected|
-  match do |actual|
-    actual = actual.split("\n")
-    actual.pop if actual.last == ""
-    expected.each do |e|
-      return false unless actual.include?(e)
-    end
-    true
-  end
-  failure_message do |actual|
-    "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