pushwagner 0.0.2.2 → 0.0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3142a8d21b384c10cadfd88fc49d904386cad79d
-  data.tar.gz: 9a9a00947c2060371ca50c55ecdc0f83be9c40fb
+  metadata.gz: fe236d345b1c2f032602d5223892be7ed6cdd787
+  data.tar.gz: 81c0457531861318a266868ee36f546d780e0a24
 SHA512:
-  metadata.gz: b7a2c24caf3673f67a632abb8540282ac2ac3464b288957282b96723b3433a394ede0810e2ac397fb1fa8e068b0f6a5384f90ab95869fc37be9eed163b79422d
-  data.tar.gz: 78de40702fca070aa7e87256d89ee36b1b638607fff2f3522ae7faadaf3c31467ea61eb5d9b2c39e5b6b97e03f773ffa5de7ba7b9e3c8ac776480be23707ab6d
+  metadata.gz: 2aa8d1dea5ceb4e4d83b1c0135919889c191f74358c823ecb921d5d218af19322130fdf14ff5ed6c2cb8052cc26f3276fe6123794d4c41ffff9365ddd38c3e12
+  data.tar.gz: 5005a2be5701ca4e1d5b6ddf75bffb3bdeedb34ba0e9496c22966f7c0b0e0ca6f78ee28a58b4e98eda961839fb98dc80ba620a5eb2addcccde9d6ace5de2c588

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pushwagner (0.0.2.2)
+    pushwagner (0.0.2.3)
       colorize (~> 0.7)
       net-scp (~> 1.2, >= 1.2.1)
       net-ssh (~> 3.1, >= 3.1.1)
@@ -11,15 +11,15 @@ GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.1)
-    colorize (0.7.7)
+    colorize (0.8.1)
     diff-lcs (1.2.5)
     method_source (0.8.2)
-    mini_portile2 (2.0.0)
+    mini_portile2 (2.2.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.1.1)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    net-ssh (3.2.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -51,4 +51,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.12.2
+   1.15.1

data/README.md

@@ -89,16 +89,16 @@ Sudo support, automatically prompts for passwd, or use: `env PUSHWAGNER_SUDO=sud
 
 ````yaml
 hooks:
-	local:
-		before:
-			- mvn package
-		after:
-			- mvn test -Pint
-	remote:
-		before:
-			- /usr/sbin/service foo stop
-		after:
-			- /usr/sbin/service foo start
+    local:
+      before:
+        - mvn package
+      after:
+        - mvn test -Pint
+    remote:
+      before:
+        - /usr/sbin/service foo stop
+      after:
+        - /usr/sbin/service foo start
 ````
 
 ### Environments

data/bin/pw

@@ -2,18 +2,31 @@
 
 require 'pushwagner'
 require 'pushwagner/version'
+require 'optparse'
+require 'ostruct'
 
 def get_version
   Pushwagner.info "You must specify which version you wish to deploy"
   STDIN.gets.strip
 end
 
-# TODO: detect version requirement from config
-version = 1 # ENV["VERSION"] || get_version
+options = OpenStruct.new
+options.environment = 'default'
+options.version = '1'
+options.config_file = '.pw.yml'
+options.command = 'todo'
 
-env = ARGV[1] || ENV['PW_ENV'] || 'default'
+OptionParser.new do |opts|
+  opts.banner = 'Usage: pw <deploy> [options]'
+  opts.on('deploy') { |v| options.command = 'deploy'}
+  opts.on('-c FILE', 'Use config file') { |v| options.config_file = v }
+  opts.on('-e ENV', 'Set environment') { |v| options.environment = v }
+  opts.on('-V VERSION', 'Set version') { |v| options.version = v }
+  opts.on('-v', '--version', 'Show version') { |v| puts Pushwagner::VERSION; exit }
+  opts.on('-h', '--help', 'Show help') { |v| puts puts opts; exit }
+end.parse!
 
-main = Pushwagner::Main.new(:config_file => 'config/deploy.yml', :version => version, :environment => env)
+main = Pushwagner::Main.new(options.to_h)
 
 puts (
 %q{
@@ -27,10 +40,9 @@ puts (
 puts
 
 
-# TODO: detect cli from config
-case ARGV[0]
+case options.command
   when "deploy"
     main.deploy
   else
-    Pushwagner.warning "Usage: pw <deploy|todo> [environment]"
+    Pushwagner.warning "Usage: pw <command> [options]"
 end

data/lib/pushwagner/main.rb

@@ -2,7 +2,12 @@ module Pushwagner
 
   class Main
     def initialize(opts = {})
-      @environment = Pushwagner::Environment.new(opts)
+      begin
+        @environment = Pushwagner::Environment.new(opts)
+      rescue => e
+        Pushwagner.severe e.message
+        raise e
+      end
     end
 
     def set_environment(env)

data/lib/pushwagner/version.rb

@@ -1,3 +1,3 @@
 module Pushwagner
-  VERSION = "0.0.2.2"
+  VERSION = "0.0.2.3"
 end

data/spec/environment_spec.rb

@@ -4,7 +4,7 @@ require 'pushwagner/environment'
 describe Pushwagner::Environment do
   describe "#initialize" do
     it "requires config_file" do
-      expect { Pushwagner::Environment.new('config_file' => File.join(config_root, 'nonexisting.yml'))}.to raise_error
+      expect { Pushwagner::Environment.new('config_file' => File.join(config_root, 'nonexisting.yml'))}.to raise_error(RuntimeError, /Couldn't find config file in locations: (.*)/)
     end
 
     it "supports config_file" do
@@ -30,14 +30,14 @@ describe Pushwagner::Environment do
 
     it "returns empty hash when not configured" do
       env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'static.yml'), :version => "1foo" )
-      expect(env.maven?).to be_false
+      expect(env.maven?).to be false
       expect(env.maven).to eq({})
     end
   end
   describe "static files" do
     it "returns empty hash when not configured" do
       env = Pushwagner::Environment.new(:config_file => File.join(config_root, 'maven.yml'), :version => "1foo" )
-      expect(env.static?).to be_false
+      expect(env.static?).to be false
       expect(env.static).to eq({})
     end
     it "parses to a hash of files" do

data/spec/hooks_spec.rb

@@ -8,7 +8,7 @@ describe Pushwagner::Hooks do
 
   describe "#initialize" do
     it "raises error if invalid environment" do
-      expect { Pushwagner::Hooks.new(nil) }.to raise_exception
+      expect { Pushwagner::Hooks.new(nil) }.to raise_exception(StandardError, /Invalid environment/)
     end
 
     it "returns an empty config with an empty environment" do
@@ -30,14 +30,16 @@ describe Pushwagner::Hooks do
   describe "#run" do
     it "requires an argument" do
       sut = Pushwagner::Hooks.new(env)
-      expect { sut.run() }.to raise_exception
+      expect { sut.run() }.to raise_exception(ArgumentError, /wrong number of arguments/) 
     end
 
     it "accepts run :after target" do
       sut = Pushwagner::Hooks.new(env)
 
-      sut.stub_chain("local.run").with(:after).once
-      sut.stub_chain("remote.run").with(:after).once
+      #sut.stub_chain("local.run").with(:after).once
+      #sut.stub_chain("remote.run").with(:after).once
+      expect(sut.local).to receive(:run).with(:after).once
+      expect(sut.remote).to receive(:run).with(:after).once
 
       sut.run(:after)
     end
@@ -45,8 +47,10 @@ describe Pushwagner::Hooks do
     it "accepts run :before target" do
       sut = Pushwagner::Hooks.new(env)
 
-      sut.stub_chain("local.run").with(:before).once
-      sut.stub_chain("remote.run").with(:before).once
+      #sut.stub_chain("local.run").with(:before).once
+      expect(sut.local).to receive(:run).with(:before).once
+      expect(sut.remote).to receive(:run).with(:before).once
+      #sut.stub_chain("remote.run").with(:before).once
 
       sut.run(:before)
     end
@@ -69,27 +73,19 @@ describe Pushwagner::Hooks::Local do
     it "requires an argument" do
       sut = Pushwagner::Hooks::Local.new(env, env.hooks['local'])
 
-      expect { sut.run() }.to raise_exception
+      expect { sut.run() }.to raise_exception(ArgumentError, /wrong number of arguments/)
     end
     it "supports :before hooks" do
       sut = Pushwagner::Hooks::Local.new(env, env.hooks['local'])
 
-      Pushwagner.stub(:info)
-      Pushwagner.stub(:begin_info)
-      Pushwagner.stub(:ok)
-
-      sut.should_receive(:system).with('echo "one"').once
+      expect(sut).to receive(:system).with('echo "one"').once
       sut.run(:before)
     end
     it "supports :after hooks" do
       sut = Pushwagner::Hooks::Local.new(env, env.hooks['local'])
 
-      Pushwagner.stub(:info)
-      Pushwagner.stub(:begin_info)
-      Pushwagner.stub(:ok)
-
-      sut.should_receive(:system).with('echo "two"').once
-      sut.should_receive(:system).with('echo "three"').once
+      expect(sut).to receive(:system).with('echo "two"').once
+      expect(sut).to receive(:system).with('echo "three"').once
       sut.run(:after)
     end
   end
@@ -111,21 +107,19 @@ describe Pushwagner::Hooks::Remote do
     it "requires an argument" do
       sut = Pushwagner::Hooks::Remote.new(env, env.hooks['remote'])
 
-      expect { sut.run() }.to raise_exception
+      expect { sut.run() }.to raise_exception(ArgumentError, /wrong number of arguments/)
     end
 
     it "supports :before hooks" do
       sut = Pushwagner::Hooks::Remote.new(env, env.hooks['remote'])
 
-      Pushwagner.stub(:info)
-      Pushwagner.stub(:begin_info)
-      Pushwagner.stub(:ok)
-
       # Mock Net::SSH inner interaction smoke test
-      ssh = mock
-      ssh.should_receive(:open_channel).exactly(4).times
-      ssh.should_receive(:loop).exactly(4).times
-      Net::SSH.should_receive(:start).and_yield(ssh).exactly(4).times
+      ssh = double()
+      
+      expect(ssh).to receive(:open_channel).exactly(4).times
+      expect(ssh).to receive(:loop).exactly(4).times
+      
+      expect(Net::SSH).to receive(:start).and_yield(ssh).exactly(4).times
 
       sut.run(:before)
     end
@@ -134,9 +128,9 @@ describe Pushwagner::Hooks::Remote do
       sut = Pushwagner::Hooks::Remote.new(env, env.hooks['remote'])
 
       # Mock Net::SSH inner interaction smoke
-      ssh = mock
-      ssh.should_receive(:open_channel).never
-      Net::SSH.should_receive(:start).and_yield(ssh).never
+      ssh = double()
+      expect(ssh).to receive(:open_channel).never
+      expect(Net::SSH).to receive(:start).and_yield(ssh).never
 
       sut.run(:after)
     end

data/spec/maven_spec.rb

@@ -43,15 +43,15 @@ describe Pushwagner::Maven do
     describe "repositories" do
       it "requires repositories configuration element" do
         cfg.delete('repositories')
-        expect {Pushwagner::Maven.new(cfg, "1")}.to raise_error(StandardError)
+        expect {Pushwagner::Maven.new(cfg, "1")}.to raise_error(StandardError, /repositories configuration required/)
       end
       it "requires 'snapshots' repository" do
         cfg['repositories'].delete('snapshots')
-        expect {Pushwagner::Maven.new(cfg, "1")}.to raise_error(StandardError)
+        expect {Pushwagner::Maven.new(cfg, "1")}.to raise_error(StandardError, /snapshots repository required/)
       end
       it "requires 'releases' repository" do
         cfg['repositories'].delete('releases')
-        expect {Pushwagner::Maven.new(cfg, "1")}.to raise_error(StandardError)
+        expect {Pushwagner::Maven.new(cfg, "1")}.to raise_error(StandardError, /releases repository required/)
       end
       it "parses repositories" do
         m = Pushwagner::Maven.new(cfg, "1")
@@ -66,7 +66,7 @@ describe Pushwagner::Maven do
 
     it "reads releases authentication from maven settings.xml" do
       m = Pushwagner::Maven.new(cfg, "1")
-      m.repository.should_receive(:open).
+      expect(m.repository).to receive(:open).
           with(/.*settings.xml$/).
           and_return(settings)
 
@@ -75,7 +75,7 @@ describe Pushwagner::Maven do
 
     it "reads snapshots authentication from maven settings.xml" do
       m = Pushwagner::Maven.new(cfg, "1")
-      m.repository.should_receive(:open).
+      expect(m.repository).to receive(:open).
           with(/.*settings.xml$/).
           and_return(settings)
 
@@ -88,8 +88,8 @@ describe Pushwagner::Maven do
     it "builds maven2-repo-style urls and retrieves metadata" do
       m = Pushwagner::Maven.new(cfg, "1")
 
-      m.repository.should_receive(:authentication).and_return("")
-      m.repository.should_receive(:open).and_return(metadata)
+      expect(m.repository).to receive(:authentication).and_return("")
+      expect(m.repository).to receive(:open).and_return(metadata)
 
       snapshot = Pushwagner::Maven::Artifact.new("foo", "bar", "1.0-SNAPSHOT")
       expect(m.repository.absolute_url(snapshot)).to eq("http://w00t.uppercase.no/nexus/content/repositories/snapshots/bar/foo/1.0-SNAPSHOT/foo-1.0-20121114.152717-3.jar")

data/spec/spec_helper.rb

@@ -11,6 +11,10 @@ RSpec.configure do |config|
   end
 
   config.expect_with(:rspec) { |c| c.syntax = :expect }
+  #config.mock_with :rspec do |mocks|
+  #  mocks.syntax = :should
+  #  mocks.yield_receiver_to_any_instance_implementation_blocks = false
+  #end
 
   def config_root
     File.join(File.dirname(__FILE__), 'configs')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushwagner
 version: !ruby/object:Gem::Version
-  version: 0.0.2.2
+  version: 0.0.2.3
 platform: ruby
 authors:
 - Ole Christian Rynning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh