pushwagner 0.0.1.8 → 0.0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aded808749a511c913730aa48a8fe9c30bbdd6d
-  data.tar.gz: 580c4d0976ddb634d044670855ed34a13feca64c
+  metadata.gz: 868b3ca9f8ea0c6060b4201bea0c4e23d6bb7925
+  data.tar.gz: 49f53b278d4c0e4a18ed8772b164ccfa5778be13
 SHA512:
-  metadata.gz: 87ba43bea04f1d3c118f399c7f755f3716094b04b1d75fe99ecd34caaaab7e3684d36be7c822d85e60c80f007c21fa841395a198b2cd2b41b0c5cbf6c6f42cdc
-  data.tar.gz: 7a300f0cc0ccf072a451bce9b7080e6d7cdf342ceab2c8aaa53766534920d23567e7ee1ffd806c0e32877e2e58ff473e95be479199d17d17caf0448b67db0aaa
+  metadata.gz: 0a66c0ddff6c4e93fb1b0891f2fefb45e9a33023c7657d7bd9a40d316a8fcc68fbc5d05c1d517a127fe8acbfe68bc24b5c97bdfd51870d36c45674fe3cfd2876
+  data.tar.gz: acf003c5a5355239a88202f015ca53abfe40b6a709f88d0858cb4d73d0a4297f448abc1a6aba6768b0cae57018a2151bad103750893449f98d38575457d73afe

data/.ruby-gemset

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

data/.ruby-version

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

data/.travis.yml

@@ -1,6 +1,3 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - jruby-18mode # JRuby in 1.8 mode
-  - jruby-19mode # JRuby in 1.9 mode
-  - 1.8.7
+  - 2.1.0

data/Gemfile

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

data/Gemfile.lock

@@ -1,15 +1,17 @@
 PATH
   remote: .
   specs:
-    pushwagner (0.0.1.7)
-      net-scp
-      net-ssh
-      nokogiri (~> 1.6.4.1)
+    pushwagner (0.0.1.9)
+      colorize (~> 0.7)
+      net-scp (~> 1.2, >= 1.2.1)
+      net-ssh (~> 2.9, >= 2.9.1)
+      nokogiri (~> 1.6)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     coderay (1.0.9)
+    colorize (0.7.3)
     diff-lcs (1.2.4)
     method_source (0.8.1)
     mini_portile (0.6.1)
@@ -37,8 +39,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.7.6)
+  bundler (~> 1.7)
   pry
   pushwagner!
-  rake (~> 10.1.0)
+  rake (~> 10.1)
   rspec

data/bin/pw

@@ -3,7 +3,7 @@
 require 'pushwagner'
 
 def get_version
-  puts "You must specify which version you wish to deploy: "
+  Pushwagner.info "You must specify which version you wish to deploy"
   STDIN.gets.strip
 end
 
@@ -18,11 +18,6 @@ main = Pushwagner::Main.new(:config_file => 'config/deploy.yml', :version => ver
 case ARGV[0]
   when "deploy"
     main.deploy
-    main.restart
-
-  when "restart"
-    main.restart
-
   else
-    puts "Usage: pw <deploy|restart> [environment]"
+    Pushwagner.warning "Usage: pw <deploy|todo> [environment]"
 end

data/lib/pushwagner/environment.rb

@@ -14,7 +14,7 @@ module Pushwagner
       config_file = look_for_config_file(opts[:config_file])
 
       @version = opts[:version] && opts[:version].to_s
-      @current = opts[:environment] || 'development'
+      @current = opts[:environment] || 'default'
 
       @config = HashWithIndifferentAccess.new(YAML::load_file(config_file) || {})
     end
@@ -43,6 +43,10 @@ module Pushwagner
       config['environments'] || {}
     end
 
+    def hooks
+      config['hooks'] || {}
+    end
+
     def environment
       environments[current] || {}
     end

data/lib/pushwagner/ext.rb

@@ -1,5 +1,8 @@
-# Use colorize gem to color/fmt output
-require 'colorize'
+class String
+  def trunc(sz)
+    self[0, sz]
+  end
+end
 
 module Pushwagner
   # Shamefully copied from ActiveSupport

data/lib/pushwagner/hooks.rb

@@ -0,0 +1,133 @@
+require 'net/https'
+require 'net/ssh'
+require 'net/scp'
+require 'open-uri'
+require 'nokogiri'
+
+module Pushwagner
+
+  #
+  # Deployer strategy for maven repos (wip).
+  #
+  class Hooks
+
+    attr_reader :remote, :local
+
+    def initialize(env)
+      raise "Invalid environment" unless env
+      default_cfg = { before: [], after: [] }
+      @local = Hooks::Local.new(env, env.hooks['local'] || default_cfg)
+      @remote = Hooks::Remote.new(env, env.hooks['remote'] || default_cfg)
+    end
+
+    def run(target)
+      if target == :before
+        local.run(target)
+        remote.run(target)
+      elsif target == :after
+        local.run(target)
+        remote.run(target)
+      end
+    end
+
+  end
+
+  class Hooks::Remote
+    
+    attr_reader :environment, :before, :after
+
+    def initialize(env, remote)
+      @environment = env
+
+      @before = remote['before'] || []
+      @after = remote['after'] || []
+    end
+
+    def run(target)
+      ssh_exec(method(target).call)
+    end
+
+    def gets_sudo_passwd
+      if ENV['PUSHWAGNER_SUDO']
+        @sudo = ENV['PUSHWAGNER_SUDO']
+      elsif @sudo.nil?
+        puts
+        Pushwagner.severe  "<<< WARNING: this operation requires privileges >>>"
+        Pushwagner.warning "Enter Ctrl+C to abort."
+        print "Enter sudo-passwd: "
+
+        begin
+          system 'stty -echo'
+        rescue
+          # windoz
+        end
+        @sudo = STDIN.gets.chomp
+        puts
+        begin
+          system 'stty echo'
+        rescue
+          # windoz
+        end
+      end
+      @sudo
+    end
+
+    def ssh_exec(cmds)
+      environment.hosts.each do |host|
+        cmds.each do |cmd|
+          # Run each cmd in a separate 'transaction'
+          Pushwagner.begin_info "Executing `#{cmd}` on #{host}"
+
+          Net::SSH.start(host, environment.user) do |ssh|
+            ssh.open_channel do |ch|
+
+              ch.request_pty do |pty_ch, success|
+                raise "could not execute #{cmd}" unless success
+
+                ch.exec("#{cmd}")
+
+                ch.on_data do |data_ch, data|
+                  if data =~ /\[sudo\] password/i
+                    ch.send_data("#{gets_sudo_passwd}\n")
+                  end
+                end
+              end
+            end
+
+            ssh.loop
+          end
+
+          Pushwagner.ok
+        end
+      end
+    end
+
+  end
+
+
+  class Hooks::Local
+    
+    attr_reader :environment, :before, :after
+
+    def initialize(env, local)
+      @environment = env
+      @before = local['before'] || []
+      @after = local['after'] || []
+    end
+
+    def run(target)
+      local_exec(method(target).call)
+    end
+
+    private
+    def local_exec(cmds)
+      cmds.each do |cmd|
+        Pushwagner.info "Executing `#{cmd}` locally..."
+
+        system("#{cmd}")
+
+      end
+    end
+
+  end
+end

data/lib/pushwagner/main.rb

@@ -14,15 +14,18 @@ module Pushwagner
     end
 
     def deploy(opts = {})
-      puts "Deploying to #{@environment.current} environment:"
-      @environment.hosts.each { |h| puts "  - #{@environment.user}@#{h}"}
+      Pushwagner.info "Starting deployment to environment: #{@environment.current}"
+      @environment.hosts.each { |h| Pushwagner.info "  - #{@environment.user}@#{h}" }
+      
+      pw_hooks = Hooks.new(@environment)
+      pw_hooks.run(:before)
 
       Maven::Deployer.new(@environment, opts).deploy if @environment.maven?
       Static::Deployer.new(@environment, opts).deploy if @environment.static?
-    end
 
-    def restart(opts = {})
-      Supervisord::Restarter.new(@environment, opts).restart
+      pw_hooks.run(:after)
     end
+
   end
+
 end

data/lib/pushwagner/maven.rb

@@ -57,6 +57,10 @@ module Pushwagner
       version.downcase =~ /snapshot/
     end
 
+    def to_s
+      "#{group_id}:#{artifact_id}:#{version}"
+    end
+
   end
 
   class Maven::Repository
@@ -116,10 +120,12 @@ module Pushwagner
     def deploy
       artifacts.each do |name, artifact|
         environment.hosts.each do |host|
+          Pushwagner.info "Deploying #{name}, #{artifact} to #{host}"
+
           mark_previous(name, host)
           pull_artifact(name, artifact, host)
           mark_new(name, artifact, host)
-          puts "Deployed to #{name}, #{artifact} to #{host}: [ " + "OK".colorize(:green) + " ]"
+
         end
       end
       true # false if failed
@@ -129,22 +135,25 @@ module Pushwagner
 
     def pull_artifact(name, artifact, host)
       Net::SSH.start(host, environment.user) do |ssh|
-        puts "Pulling #{repository.absolute_url(artifact)} to #{host}:#{environment.path_prefix}/#{artifact.jar_name}..."
+        Pushwagner.begin_info "Pulling #{repository.absolute_url(artifact)} to #{host}:#{environment.path_prefix}/#{artifact.jar_name}"
         ssh.exec("curl --user '#{repository.authentication(artifact.snapshot?)}' #{repository.absolute_url(artifact)} > #{environment.path_prefix}/#{name}/#{artifact.jar_name}")
+        Pushwagner.ok
       end
     end
 
     def mark_previous(name, host)
       Net::SSH.start(host, environment.user) do |ssh|
-        puts "Marking previous release on #{host}..."
+        Pushwagner.begin_info "Marking previous release on #{host}"
         ssh.exec("cp -P #{environment.path_prefix}/#{name}/#{name}.jar #{environment.path_prefix}/#{name}/#{name}.previous.jar")
+        Pushwagner.ok
       end
     end
 
     def mark_new(name, artifact, host)
       Net::SSH.start(host, environment.user) do |ssh|
-        puts "Marking #{artifact.jar_name} as current on #{host}..."
+        Pushwagner.begin_info "Marking #{artifact.jar_name} as current on #{host}"
         ssh.exec("ln -sf #{environment.path_prefix}/#{name}/#{artifact.jar_name} #{environment.path_prefix}/#{name}/#{name}.jar")
+        Pushwagner.ok
       end
     end
 

data/lib/pushwagner/static.rb

@@ -15,14 +15,19 @@ module Pushwagner
           environment.hosts.each do |host|
             Net::SCP.start(host, environment.user) do |scp|
               dest = name.start_with?('/') ? name : "#{environment.path_prefix}/#{name}/"
-              puts "Uploading files to #{host}:#{dest}/"
+              Pushwagner.begin_info "Uploading files to #{host}:#{dest}"
+
               files.each do |f|
                 if File.exists?(f)
                   scp.upload!(f, dest, :recursive => File.directory?(f))
                 else
-                  puts "Warning: File #{f} does not exist"
+                  puts
+                  Pushwagner.warning "Local file #{f} does not exist"
+                  puts
                 end
               end
+
+              Pushwagner.ok
             end
           end
         end

data/lib/pushwagner/util.rb

@@ -0,0 +1,25 @@
+# Use colorize gem to color/fmt output
+require 'colorize'
+
+module Pushwagner
+  def self.ok
+    puts '[ ' + 'OK'.colorize(:green) + ' ]'
+  end
+
+  def self.severe(str)
+    puts str.trunc(99).colorize(color: :red, mode: :bold)
+  end
+
+  def self.begin_info(str)
+    print str.trunc(99).ljust(101, ".").colorize(mode: :bold)
+  end
+
+  def self.info(str)
+    puts str.trunc(99).colorize(mode: :bold)
+  end
+
+  def self.warning(str)
+    puts str.trunc(99).colorize(color: :yellow)
+  end
+
+end

data/lib/pushwagner/version.rb

@@ -1,3 +1,3 @@
 module Pushwagner
-  VERSION = "0.0.1.8"
+  VERSION = "0.0.1.10"
 end

data/lib/pushwagner.rb

@@ -1,6 +1,7 @@
 require 'pushwagner/ext'
+require 'pushwagner/util'
 require 'pushwagner/environment'
 require 'pushwagner/maven'
 require 'pushwagner/static'
-require 'pushwagner/supervisord'
+require 'pushwagner/hooks'
 require 'pushwagner/main'

data/spec/configs/hooks.yml

@@ -0,0 +1,18 @@
+path_prefix: /static/path
+
+hooks:
+  remote: 
+    before:
+      - ls
+      - echo "foo"
+  local:
+    before:
+      - echo "one"
+    after:
+      - echo "two"
+      - echo "three"
+
+environments:
+  default:
+    hosts: [www.uppercase.no, www2.uppercase.no]
+    user:  www-data

data/spec/hooks_spec.rb

@@ -0,0 +1,145 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'pushwagner/environment'
+
+describe Pushwagner::Hooks do
+  #let(:cfg) {YAML::load_file(File.join(config_root, 'hooks.yml'))}
+
+  let(:env) { Pushwagner::Environment.new(config_file: File.join(config_root, 'hooks.yml')) }
+
+  describe "#initialize" do
+    it "raises error if invalid environment" do
+      expect { Pushwagner::Hooks.new(nil) }.to raise_exception
+    end
+
+    it "returns an empty config with an empty environment" do
+      sut = Pushwagner::Hooks.new(Pushwagner::Environment.new(config_file: File.join(config_root, 'empty.yml')))
+      expect(sut.local.before).to eq([])
+      expect(sut.local.after).to eq([])
+      expect(sut.remote.before).to eq([])
+      expect(sut.remote.after).to eq([])
+    end
+
+    it "returns a full working config" do
+      sut = Pushwagner::Hooks.new(env)
+      expect(sut.remote.before).to eq(['ls', 'echo "foo"'])
+      expect(sut.remote.after).to eq([])
+      expect(sut.local.before).to eq(['echo "one"'])
+      expect(sut.local.after).to eq(['echo "two"', 'echo "three"'])
+    end
+  end
+  describe "#run" do
+    it "requires an argument" do
+      sut = Pushwagner::Hooks.new(env)
+      expect { sut.run() }.to raise_exception
+    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.run(:after)
+    end
+
+    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.run(:before)
+    end
+  end
+
+end
+
+describe Pushwagner::Hooks::Local do
+  let(:env) { Pushwagner::Environment.new(config_file: File.join(config_root, 'hooks.yml')) }
+
+  describe "#initialize" do
+    it "returns an empty config without a config" do
+      sut = Pushwagner::Hooks::Local.new(env, env.hooks['local'])
+      expect(sut.before).to eq(['echo "one"'])
+      expect(sut.after).to eq(['echo "two"', 'echo "three"'])
+    end
+  end
+
+  describe "#run" do
+    it "requires an argument" do
+      sut = Pushwagner::Hooks::Local.new(env, env.hooks['local'])
+
+      expect { sut.run() }.to raise_exception
+    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
+      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
+      sut.run(:after)
+    end
+  end
+
+end
+
+describe Pushwagner::Hooks::Remote do
+  let(:env) { Pushwagner::Environment.new(config_file: File.join(config_root, 'hooks.yml')) }
+
+  describe "#initialize" do
+    it "returns an empty config without a config" do
+      sut = Pushwagner::Hooks::Remote.new(env, env.hooks['remote'])
+      expect(sut.before).to eq(['ls', 'echo "foo"'])
+      expect(sut.after).to eq([])
+    end
+  end
+
+  describe "#run" do
+    it "requires an argument" do
+      sut = Pushwagner::Hooks::Remote.new(env, env.hooks['remote'])
+
+      expect { sut.run() }.to raise_exception
+    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
+
+      sut.run(:before)
+    end
+
+    it "supports :after hooks" 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
+
+      sut.run(:after)
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushwagner
 version: !ruby/object:Gem::Version
-  version: 0.0.1.8
+  version: 0.0.1.10
 platform: ruby
 authors:
 - Ole Christian Rynning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -128,7 +128,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rvmrc"
+- ".ruby-gemset"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -139,19 +140,22 @@ files:
 - lib/pushwagner.rb
 - lib/pushwagner/environment.rb
 - lib/pushwagner/ext.rb
+- lib/pushwagner/hooks.rb
 - lib/pushwagner/main.rb
 - lib/pushwagner/maven.rb
 - lib/pushwagner/static.rb
-- lib/pushwagner/supervisord.rb
+- lib/pushwagner/util.rb
 - lib/pushwagner/version.rb
 - pushwagner.gemspec
 - spec/configs/empty.yml
 - spec/configs/full.yml
+- spec/configs/hooks.yml
 - spec/configs/maven-metadata.xml
 - spec/configs/maven.yml
 - spec/configs/settings.xml
 - spec/configs/static.yml
 - spec/environment_spec.rb
+- spec/hooks_spec.rb
 - spec/maven_spec.rb
 - spec/spec_helper.rb
 homepage: http://rubygems.org/gems/pushwagner
@@ -181,10 +185,12 @@ summary: Simple remote automation wrapper (wip).
 test_files:
 - spec/configs/empty.yml
 - spec/configs/full.yml
+- spec/configs/hooks.yml
 - spec/configs/maven-metadata.xml
 - spec/configs/maven.yml
 - spec/configs/settings.xml
 - spec/configs/static.yml
 - spec/environment_spec.rb
+- spec/hooks_spec.rb
 - spec/maven_spec.rb
 - spec/spec_helper.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@pw --create

data/lib/pushwagner/supervisord.rb

@@ -1,14 +0,0 @@
-require 'net/ssh'
-
-module Pushwagner
-  module Supervisord
-    class Restarter
-      def initialize(environment, opts = {})
-      end
-
-      def restart
-        puts "..."
-      end
-    end
-  end
-end