skynet-deploy 1.2.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: d95d2b638d8f8be544d5c42e7e6641cc5cb25d15c7b7ede90cb1619cef4898ee
+  data.tar.gz: 2442555551e7836aed334417344571c7e0aaf54e83960e2f3dc4c6d718992445
+SHA512:
+  metadata.gz: 5c4e37a158a27f1b1e95c448d6ca7b11cf2e66f1398c874a89950fad652bdb338552c9c4724f937c5c9b972b880e3d1021c8d1b6d64544d8ea718822f98dd2db
+  data.tar.gz: 9d89854abc786aad9e87e3d1d5061525d2c0aa6431a668e1b67b64e87d39435d8547af35de4a4a24e90b5f3a9aea345454df18c94c22c6105e11a13764f4ed65

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 spec/test.log
+tags

data/.ruby-version

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

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 2.7
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+script: bundle exec rake spec

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -1,6 +1,8 @@
 Skynet
 ======
 
+[![Build Status](https://travis-ci.com/rahearn/skynet.svg?branch=master)](https://travis-ci.com/rahearn/skynet)
+
 GitHub-aware website builder
 
 Skynet builds and deploys web sites on your VPS or bare metal server. It is triggered by the post-receive hook.
@@ -20,7 +22,8 @@ Usage
 * Install basic config file: `$ skynet config <first project name>`
 * edit config file to add your repositories
 * Run builder by hand to ensure everything works: `$ skynet build`
-* Add `http://YOUR_SKYNET_SERVER/PROJECT_NAME` as a WebHook URL to your repository under `Admin -> Service Hooks`
+* Add `http://YOUR_SKYNET_SERVER/PROJECT_NAME` as a Webhook Payload URL to your repository under
+ `Settings -> Webhooks`. Choose `application/json` as the Content type.
 * Start server: `$ skynet server`
 
 Config file arguments
@@ -55,3 +58,8 @@ a git server other than GitHub.
 
 The URL must be visible from the Skynet server, as it will pull a new
 copy of the repository from this server.
+
+Upgrading from 1.x
+==================
+
+* Private repositories must explicitly set the `repository` key in the config to the ssh-compatible url. Previously this was optional for Github repos

data/lib/skynet.rb

@@ -1,6 +1,9 @@
 require 'skynet/version'
 require 'logger'
 
+require 'i18n'
+I18n.enforce_available_locales = false
+
 module Skynet
 
   autoload :Builder, 'skynet/builder'
@@ -10,7 +13,7 @@ module Skynet
   autoload :HookGenerator, 'skynet/hook_generator'
 
   def self.logger
-    @logger ||= Logger.new(STDOUT)
+    @logger ||= Logger.new($stdout)
   end
 
   def self.logger=(logger)

data/lib/skynet/app.rb

@@ -3,19 +3,21 @@ require 'json'
 require 'active_support/core_ext/object/blank'
 
 module Skynet
-
   class App < Sinatra::Base
-
     before do
-      @payload = JSON.parse params[:payload] unless params[:payload].nil?
+      @payload = begin
+        JSON.parse request.body.read
+      rescue JSON::ParserError
+        {}
+      end
     end
 
     get '/' do
-      %[Hello. Check <a href="https://github.com/coshx/skynet">github</a> for more infomation on skynet]
+      %[Hello. Check <a href="https://github.com/rahearn/skynet">github</a> for more infomation on skynet]
     end
 
     post '/' do
-      Skynet.logger.debug "post root params: #{params.inspect}"
+      Skynet.logger.debug "post '/' payload: #{@payload.inspect}"
       app_name = settings.config.each { |n, c| break n if c[:url] == @payload['repository']['url'] }
       if app_name.is_a? String
         deploy app_name
@@ -26,14 +28,14 @@ module Skynet
     end
 
     post '/:app_name' do |app_name|
-      Skynet.logger.debug "post /#{app_name} params: #{params.inspect}"
+      Skynet.logger.debug "post '/#{app_name}' payload: #{@payload.inspect}"
       deploy app_name
     end
 
     private
 
     def deploy(app_name)
-      Skynet.logger.info %{Attempting to deploy "#{app_name.class.name}"}
+      Skynet.logger.info %{Attempting to deploy "#{app_name}"}
       config = settings.config[app_name]
       if deployable? config
         Builder.build app_name, config, branch
@@ -44,15 +46,18 @@ module Skynet
     end
 
     def deployable?(config)
+      Skynet.logger.debug "Payload url: #{@payload['repository']['url']}"
+      Skynet.logger.debug "Payload after: #{@payload['after']}"
       config.present? &&
         config[:url] == @payload['repository']['url'] &&
+        @payload['after'].present? &&
         @payload['after'] !~ /^0{40}$/
     end
 
     def branch
+      Skynet.logger.debug "Payload ref: #{@payload['ref']}"
       @payload['ref'] =~ %r[^refs/heads/(.*)$]
       $1
     end
   end
-
 end

data/lib/skynet/builder/base.rb

@@ -13,7 +13,7 @@ module Skynet
       attr_accessor :app, :url, :branch, :destination, :branches, :type, :repository
       attr_reader :source, :key
 
-      validates_presence_of :app, :url, :branch, :destination, :branches
+      validates_presence_of :app, :url, :branches, :branch, :destination
       validates_inclusion_of :type,
         in: ALLOWED_BUILDERS,
         message: "must be one of #{ALLOWED_BUILDERS}"
@@ -26,26 +26,28 @@ module Skynet
         @source  = File.join Dir.pwd, app, '.'
         @key     = config[:key]
 
-        if config[:branches].blank?
-          Skynet.logger.warn "Passing a single branch and destination is deprecated and will be removed in 2.0"
-          Skynet.logger.warn "Please change to:\nbranches:\n  #{config[:branch]}: #{config[:destination]}"
-          self.branches = { config[:branch] => config[:destination] }
-        else
-          self.branches = config[:branches]
+        self.branches = config[:branches]
+        if branches.present? && branches.first.present?
+          self.branch      = branches.first[0]
+          self.destination = branches.first[1]
         end
-        self.branch      = branches.first[0]
-        self.destination = branches.first[1]
-        self.url         = config[:url]
-        self.type        = config[:type]
-        self.repository  = config[:repository]
+        self.url        = config[:url]
+        self.type       = config[:type]
+        self.repository = config[:repository]
       end
 
       def build(branch=nil)
-        unless branch.blank?
+        if branch.present?
           return if branches[branch].blank?
           self.branches = { branch => branches[branch] }
         end
 
+        unless valid?
+          Skynet.logger.error "Configuration error for #{app} (branch: #{branch})"
+          Skynet.logger.error errors.full_messages.join '. '
+          raise ArgumentError
+        end
+
         branches.each_pair do |branch, destination|
           self.branch      = branch.to_s
           self.destination = destination
@@ -70,18 +72,7 @@ module Skynet
       end
 
       def remote_repository
-        repository || translate_url
-      end
-
-      def translate_url
-        uri = URI.parse url
-        if uri.host == 'github.com'
-          "git@github.com:#{uri.path.gsub %r[(^/)|(/$)|(\.git$)], ''}.git"
-        else
-          url
-        end
-      rescue URI::InvalidURIError
-        url
+        repository || url
       end
 
       def create_repo

data/lib/skynet/builder/jekyll.rb

@@ -6,7 +6,7 @@ module Skynet
 
       def execute
         Skynet.logger.debug "PWD: #{Dir.pwd} Source: #{source} Destination: #{destination}"
-        Skynet.logger.info `jekyll --no-server --no-auto #{source} #{destination}`
+        Skynet.logger.info `jekyll build --source #{source} --destination #{destination}`
 
         Skynet.logger.info 'Jekyll finished'
       end

data/lib/skynet/cli.rb

@@ -20,9 +20,9 @@ module Skynet
     method_option :port, type: :numeric, default: 7575, aliases: '-p', desc: 'Port to listen on'
     method_option :host, type: :string, default: '0.0.0.0', aliases: '-h', desc: 'Interface to listen on'
     method_option :file, type: :string, default: './config.yml', aliases: '-f', desc: 'Configuration file'
-    method_option :log, type: :string, default: 'skynet.log', aliases: '-l', desc: 'Log file'
+    method_option :log, type: :string, aliases: '-l', desc: 'Log file'
     def server
-      Skynet.logger = Logger.new options[:log], 'weekly'
+      Skynet.logger = Logger.new(options[:log], 'weekly') unless options[:log].nil?
 
       unless File.exist? options[:file]
         Skynet.logger.fatal "Configuration file #{options[:file]} cannot be found"

data/lib/skynet/version.rb

@@ -1,3 +1,3 @@
 module Skynet
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end

data/lib/skynet/wizard.rb

@@ -19,9 +19,9 @@ module Skynet
     def repository_url
       if ask('Is the repository on github? (y/n)').downcase == 'y'
         @github = true
-        owner = ask 'Repository owner:'
-        project = ask 'Github project name:'
-        "https://github.com/#{owner}/#{project}"
+        @owner = ask 'Repository owner:'
+        @project = ask 'Github project name:'
+        "https://github.com/#{@owner}/#{@project}"
       else
         @github = false
         ask 'Repository URL:'
@@ -40,9 +40,13 @@ module Skynet
     def private_key
       needs_key = ask('Is this a private repository? (y/n)').downcase
       if needs_key == 'y'
-        ["  key: #{ask 'Full path to ssh key:'}"].tap do |pk|
-          pk << "  repository: #{ask 'SSH repository address:'}" unless @github
-        end.join "\n"
+        private_configs = ["  key: #{ask 'Full path to ssh key:'}"]
+        if @github
+          private_configs << "  repository: git@github.com:#{@owner}/#{@project}.git"
+        else
+          private_configs << "  repository: #{ask 'SSH repository address:'}"
+        end
+        private_configs.join "\n"
       else
         nil
       end

data/skynet.gemspec

@@ -7,28 +7,28 @@ Gem::Specification.new do |s|
   s.version     = Skynet::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ryan Ahearn"]
-  s.email       = ["ryan@coshx.com"]
-  s.homepage    = "https://github.com/coshx/skynet"
+  s.email       = ["ryan.ahearn@hey.com"]
+  s.homepage    = "https://github.com/rahearn/skynet"
   s.summary     = %q{Sinatra app that listens for GitHub post-receive callbacks and deploys your code}
   s.description = %q{Sinatra app that listens for GitHub post-receive callbacks and deploys your code}
 
-  s.required_rubygems_version = ">= 1.3.6"
+  s.required_ruby_version = ">= 2.7.1"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'sinatra',       '~> 1.3'
-  s.add_runtime_dependency 'thin',          '~> 1.4'
-  s.add_runtime_dependency 'json',          '~> 1.7'
-  s.add_runtime_dependency 'jekyll',        '~> 0.11'
-  s.add_runtime_dependency 'thor',          '~> 0.16'
-  s.add_runtime_dependency 'activesupport', '~> 3.2'
-  s.add_runtime_dependency 'activemodel',   '~> 3.2'
-  s.add_runtime_dependency 'multi_json',    '~> 1.0'
+  s.add_runtime_dependency 'sinatra',       '~> 2.1'
+  s.add_runtime_dependency 'thin',          '~> 1.7'
+  s.add_runtime_dependency 'json',          '~> 2.3'
+  s.add_runtime_dependency 'jekyll',        '~> 4.1'
+  s.add_runtime_dependency 'thor',          '~> 1.0'
+  s.add_runtime_dependency 'activesupport', '~> 6.0'
+  s.add_runtime_dependency 'activemodel',   '~> 6.0'
+  s.add_runtime_dependency 'multi_json',    '~> 1.15'
 
-  s.add_development_dependency 'rake',             '~> 0.9'
-  s.add_development_dependency 'rspec',            '~> 2.11'
-  s.add_development_dependency 'shoulda-matchers', '~> 1.2'
+  s.add_development_dependency 'rake',             '~> 13.0'
+  s.add_development_dependency 'rspec',            '~> 3.9'
+  s.add_development_dependency 'shoulda-matchers', '~> 4.4'
 end

data/spec/skynet/builder/base_spec.rb

@@ -1,13 +1,11 @@
 require 'spec_helper'
-require 'active_model'
-require 'shoulda-matchers'
 
-describe Skynet::Builder::Base do
+describe Skynet::Builder::Base, type: :model do
 
   let(:source)  { File.join Dir.pwd, 'app', '.' }
   let(:url)     { 'https://github.com/org/app' }
   let(:repo)    { 'git@github.com:org/app.git' }
-  let(:options) { {url: url, branch: 'master', destination: '/var/www', type: 'static'} }
+  let(:options) { {url: url, branches: {main: '/var/www'}, type: 'static'} }
   subject       { described_class.new 'app', options }
 
   describe ".validations" do
@@ -16,48 +14,48 @@ describe Skynet::Builder::Base do
     it { should validate_presence_of :branch }
     it { should validate_presence_of :destination }
     it { should validate_presence_of :branches }
-    it { should ensure_inclusion_of(:type).in_array(%w[static jekyll]).allow_nil(false).allow_blank(false) }
+    it { should validate_inclusion_of(:type).in_array(%w[static jekyll]).with_message("must be one of [\"static\", \"jekyll\"]") }
     it { should_not allow_value('base').for :type }
     describe "on @branches" do
       before(:each) { subject.valid? }
 
       context "when passed a single branch" do
-        specify { subject.errors[:branches].should be_empty }
+        specify { expect(subject.errors[:branches]).to be_empty }
       end
       context "when passed multiple valid branches" do
-        let(:options) { {url: url, type: 'static', branches: {master: '/var/www/production', develop: '/var/www/staging'}} }
-        specify { subject.errors[:branches].should be_empty }
+        let(:options) { {url: url, type: 'static', branches: {main: '/var/www/production', develop: '/var/www/staging'}} }
+        specify { expect(subject.errors[:branches]).to be_empty }
       end
       context "when passed an invalid branch" do
-        let(:options) { {url: url, type: 'static', branches: {master: '/var/www', develop: ''}} }
+        let(:options) { {url: url, type: 'static', branches: {main: '/var/www', develop: ''}} }
         it "has an error on branches" do
-          subject.errors[:branches].should include('develop must have a destination')
+          expect(subject.errors[:branches]).to include('develop must have a destination')
         end
       end
     end
     describe "on @key" do
       context "when not passed a key" do
         before(:each) { subject.valid? }
-        specify { subject.errors[:key].should be_empty }
+        specify { expect(subject.errors[:key]).to be_empty }
       end
 
       context "when passed a valid key" do
-        let(:options) { {key: 'keyfile'} }
+        let(:options) { {branches: {main: "/tmp"}, key: 'keyfile'} }
         before(:each) do
-          File.stub(:readable?).and_return true
+          allow(File).to receive(:readable?).and_return true
           subject.valid?
         end
-        specify { subject.errors[:key].should be_empty }
+        specify { expect(subject.errors[:key]).to be_empty }
       end
 
       context "when passed an invalid key" do
-        let(:options) { {key: 'missing_keyfile'} }
+        let(:options) { {branches: {main: "/tmp"}, key: 'missing_keyfile'} }
         before(:each) do
-          File.stub(:readable?).and_return false
+          allow(File).to receive(:readable?).and_return false
           subject.valid?
         end
         it "has an error on key" do
-          subject.errors[:key].should include('must be present and readable')
+          expect(subject.errors[:key]).to include('must be present and readable')
         end
       end
     end
@@ -65,8 +63,8 @@ describe Skynet::Builder::Base do
 
   describe "#build" do
     before(:each) do
-      subject.stub :build_repository
-      subject.stub :execute
+      allow(subject).to receive(:build_repository)
+      allow(subject).to receive(:execute)
     end
 
     context "when valid" do
@@ -77,7 +75,7 @@ describe Skynet::Builder::Base do
       it { expect { subject.build }.to raise_error ArgumentError }
     end
     context "when passing a branch" do
-      it { expect { subject.build 'master' }.to_not raise_error }
+      it { expect { subject.build 'main' }.to_not raise_error }
       it "d" do
         subject.build 'develop'
       end
@@ -86,44 +84,44 @@ describe Skynet::Builder::Base do
 
   context "private methods" do
     before(:each) do
-      subject.branch      = 'master'
+      subject.branch      = 'main'
       subject.destination = '/var/www'
     end
 
     describe "#build_repository" do
       context "repo already exists" do
-        before(:each) { subject.stub(:repo_exists?).and_return true }
+        before(:each) { allow(subject).to receive(:repo_exists?).and_return true }
 
         it "updates the repository" do
-          subject.should_receive(:update_repo).with no_args
+          expect(subject).to receive(:update_repo).with no_args
           subject.send :build_repository
         end
       end
 
       context "repo does not exist" do
-        before(:each) { subject.stub(:repo_exists?).and_return false }
+        before(:each) { allow(subject).to receive(:repo_exists?).and_return false }
 
         it "creates a new repository" do
-          subject.should_receive(:create_repo).with no_args
+          expect(subject).to receive(:create_repo).with no_args
           subject.send :build_repository
         end
       end
     end
 
     describe "#create_repo" do
-      before(:each) { subject.should_receive(:`).with "rm -rf #{source}" }
+      before(:each) { expect(subject).to receive(:`).with "rm -rf #{source}" }
 
       context "without key" do
         it "should call git clone" do
-          subject.should_receive(:`).with "git clone #{repo} app; cd #{source}; git checkout master"
+          expect(subject).to receive(:`).with "git clone #{url} app; cd #{source}; git checkout main"
           subject.send :create_repo
         end
       end
 
       context "with key" do
-        let(:options) { {key: 'keyfile', url: url, branch: 'master', destination: '/var/www', type: 'static'} }
+        let(:options) { {key: 'keyfile', url: url, repository: repo, branches: {main: '/var/www'}, type: 'static'} }
         it "should call git clone" do
-          subject.should_receive(:`).with "ssh-agent bash -c 'ssh-add keyfile; git clone #{repo} app'; cd #{source}; git checkout master"
+          expect(subject).to receive(:`).with "ssh-agent bash -c 'ssh-add keyfile; git clone #{repo} app'; cd #{source}; git checkout main"
           subject.send :create_repo
         end
       end
@@ -132,15 +130,15 @@ describe Skynet::Builder::Base do
     describe "#update_repo" do
       context "without key" do
         it "should call git pull" do
-          subject.should_receive(:`).with "cd #{source}; git checkout master; git pull origin master"
+          expect(subject).to receive(:`).with "cd #{source}; git checkout main; git pull origin main"
           subject.send :update_repo
         end
       end
 
       context "with key" do
-        let(:options) { {key: 'keyfile', url: url, branch: 'master', destination: '/var/www', type: 'static'} }
+        let(:options) { {key: 'keyfile', url: url, branches: {main: '/var/www'}, type: 'static'} }
         it "should call git pull" do
-          subject.should_receive(:`).with "cd #{source}; git checkout master; ssh-agent bash -c 'ssh-add keyfile; git pull origin master'"
+          expect(subject).to receive(:`).with "cd #{source}; git checkout main; ssh-agent bash -c 'ssh-add keyfile; git pull origin main'"
           subject.send :update_repo
         end
       end
@@ -148,7 +146,7 @@ describe Skynet::Builder::Base do
 
     describe "#repo_exists?" do
       before(:each) do
-        File.should_receive(:exist?).with File.join(source, '.git')
+        expect(File).to receive(:exist?).with(File.join(source, '.git'))
       end
 
       it { subject.send :repo_exists? }

data/spec/skynet/builder/jekyll_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Skynet::Builder::Jekyll do
+describe Skynet::Builder::Jekyll, type: :model do
 
   let(:app)     { 'app' }
   let(:dest)    { '/var/www/app' }
-  let(:options) { {destination: dest} }
+  let(:options) { {branches: {main: dest}} }
   let(:source)  { File.join Dir.pwd, app, '.' }
   subject do
     described_class.new(app, options).tap do |b|
@@ -14,7 +14,7 @@ describe Skynet::Builder::Jekyll do
 
   describe "#execute" do
     it "runs jekyll with the source and destination" do
-      subject.should_receive(:`).with "jekyll --no-server --no-auto #{source} #{dest}"
+      expect(subject).to receive(:`).with "jekyll build --source #{source} --destination #{dest}"
       subject.execute
     end
   end

data/spec/skynet/builder/static_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Skynet::Builder::Static do
+describe Skynet::Builder::Static, type: :model do
 
   let(:app)     { 'app' }
   let(:dest)    { '/var/www/app' }
-  let(:options) { {destination: dest} }
+  let(:options) { {branches: {main: dest}} }
   let(:source)  { File.join Dir.pwd, app, '.' }
   subject do
     described_class.new(app, options).tap do |b|
@@ -13,26 +13,26 @@ describe Skynet::Builder::Static do
   end
 
   describe "#execute" do
-    before(:each) { Dir.stub(:glob).and_return [:one, :two] }
+    before(:each) { allow(Dir).to receive(:glob).and_return([:one, :two]) }
 
     it "removes destination files first" do
-      FileUtils.stub :remove_entry_secure
-      FileUtils.stub :cp_r
-      FileUtils.should_receive(:rm_rf).with [:one, :two], secure: true
+      allow(FileUtils).to receive(:remove_entry_secure)
+      allow(FileUtils).to receive(:cp_r)
+      expect(FileUtils).to receive(:rm_rf).with([:one, :two], secure: true)
       subject.execute
     end
 
     it "copies files to the destination" do
-      FileUtils.stub :rm_rf
-      FileUtils.stub :remove_entry_secure
-      FileUtils.should_receive(:cp_r).with(source, dest)
+      allow(FileUtils).to receive(:rm_rf)
+      allow(FileUtils).to receive(:remove_entry_secure)
+      expect(FileUtils).to receive(:cp_r).with(source, dest)
       subject.execute
     end
 
     it "removes .git from the destination" do
-      FileUtils.stub :rm_rf
-      FileUtils.stub :cp_r
-      FileUtils.should_receive(:remove_entry_secure).with "#{dest}/.git"
+      allow(FileUtils).to receive(:rm_rf)
+      allow(FileUtils).to receive(:cp_r)
+      expect(FileUtils).to receive(:remove_entry_secure).with("#{dest}/.git")
       subject.execute
     end
   end

data/spec/skynet/builder_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 
 describe Skynet::Builder do
 
-  let(:builder)    { mock('builder').as_null_object }
-  let(:mock_class) { mock('builder class').as_null_object }
+  let(:builder)    { double('builder').as_null_object }
+  let(:mock_class) { double('builder class').as_null_object }
   let(:config)     { {type: 'static'} }
 
   describe ".for_app" do
     let(:args) { [:app, config] }
 
     it "initializes a new builder class" do
-      described_class.should_receive(:const_get).with('Static').and_return mock_class
-      mock_class.should_receive(:new).with(:app, config).and_return builder
+      expect(described_class).to receive(:const_get).with('Static').and_return(mock_class)
+      expect(mock_class).to receive(:new).with(:app, config).and_return(builder)
 
       described_class.for_app *args
     end
@@ -21,8 +21,8 @@ describe Skynet::Builder do
     let(:args) { [:app, config, :master] }
 
     it "calls build on the new builder" do
-      described_class.stub(:for_app).and_return builder
-      builder.should_receive(:build).with :master
+      allow(described_class).to receive(:for_app).and_return(builder)
+      expect(builder).to receive(:build).with(:master)
 
       described_class.build *args
     end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require 'bundler/setup'
+require 'active_model'
+require 'shoulda-matchers'
 
 require 'skynet'
 
@@ -6,4 +8,15 @@ Skynet.logger = Logger.new File.join(File.dirname(__FILE__), 'test.log')
 
 RSpec.configure do |config|
   config.mock_with :rspec
+  config.expect_with :rspec
+end
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+
+    # Keep as many of these lines as are necessary:
+    # with.library :active_record
+    with.library :active_model
+  end
 end

metadata

@@ -1,204 +1,182 @@
 --- !ruby/object:Gem::Specification
 name: skynet-deploy
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Ryan Ahearn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2020-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '4.4'
 description: Sinatra app that listens for GitHub post-receive callbacks and deploys
   your code
 email:
-- ryan@coshx.com
+- ryan.ahearn@hey.com
 executables:
 - skynet
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rvmrc
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -220,32 +198,27 @@ files:
 - spec/skynet/builder/static_spec.rb
 - spec/skynet/builder_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/coshx/skynet
+homepage: https://github.com/rahearn/skynet
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3009597360161477294
+      version: 2.7.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
-specification_version: 3
+rubygems_version: 3.1.4
+signing_key:
+specification_version: 4
 summary: Sinatra app that listens for GitHub post-receive callbacks and deploys your
   code
 test_files:

data/.rvmrc

@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.3-p327@skynet"
-
-#
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-
-  if [[ -s ".rvm/hooks/after_use" ]]
-  then
-    . ".rvm/hooks/after_use"
-  fi
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  if ! rvm --create  "$environment_id"
-  then
-    echo "Failed to create RVM environment ''."
-  fi
-fi
-
-#
-# If you use an RVM gemset file to install a list of gems (*.gems), you can have
-# it be automatically loaded. Uncomment the following and adjust the filename if
-# necessary.
-#
-# filename=".gems"
-# if [[ -s "$filename" ]] ; then
-#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
-# fi
-