vx-common 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc6f3bba460f725a826601a0ec3a41d551d6e906
-  data.tar.gz: 65f6998ccdd5bec2c6fbc1b280c6707c3bc292e4
+  metadata.gz: aeaa48cff84a589e79162bba246ac94d5e2b5571
+  data.tar.gz: 6c8010c307bd983da2aeb965f8114467a9a6143f
 SHA512:
-  metadata.gz: d1ab8f1ab621d9a4713bf64e1ed97bf3aa699b7eb4e6f297fbb40ef6343838f2b51613b683f5ac59cd7b9f8dba0012bd75e17ef7608a4d28e14b32843e643a2c
-  data.tar.gz: e10cb43a542e9fa48655bb1cace53670856b4cedb48c131e0ac9717afb0afc2bb0f4a4b74224de231d7f55576cd4577e905a2275e599d7fce3b68c22251ded69
+  metadata.gz: 19f77dddca2f2e2d8a50362920921d0cd54cc7b455e265b4ae47f367d4d5dca961053c46c5d66e2e3d71d2b2e6140c832684879a8d907027e8966e65957d7010
+  data.tar.gz: 9155353231dbd9c1128e56431fbb59afddc7d57bc7dca0fe2b4142e951b1cac3a9328d8ec57608789d1a292125e9d8428c49a25e8d23434e718c3ec28e9c0997

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
   - 2.0.0
-  - 2.1.0
+  - 2.1.2
 
 script: "bundle exec rake travis"

data/lib/vx/common.rb

@@ -9,8 +9,6 @@ module Vx
     end
 
     autoload :OutputBuffer,  File.expand_path("../common/output_buffer",      __FILE__)
-    autoload :EnvFile,       File.expand_path("../common/env_file",           __FILE__)
-    autoload :ErrorNotifier, File.expand_path("../common/error_notifier",     __FILE__)
     autoload :Git,           File.expand_path("../common/git",                __FILE__)
   end
 

data/lib/vx/common/git.rb

@@ -21,7 +21,7 @@ module Vx
       def git_ssh_content(key_location)
         key = key_location ? "-i #{key_location}" : ""
         out = "#!/bin/sh\n"
-        out << "/usr/bin/ssh"
+        out << "exec /usr/bin/ssh"
         out << " -A -o LogLevel=quiet"
         out << " -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
         out << " #{key} $@\n"

data/lib/vx/common/version.rb

@@ -1,5 +1,5 @@
 module Vx
   module Common
-    VERSION = "0.3.2"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-common
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vx-common-spawn
@@ -136,19 +136,13 @@ files:
 - LICENSE.txt
 - Rakefile
 - lib/vx/common.rb
-- lib/vx/common/amqp_setup.rb
-- lib/vx/common/env_file.rb
-- lib/vx/common/error_notifier.rb
 - lib/vx/common/git.rb
 - lib/vx/common/helper/middlewares.rb
-- lib/vx/common/helper/shell.rb
 - lib/vx/common/helper/upload_sh_command.rb
 - lib/vx/common/output_buffer.rb
-- lib/vx/common/tagged_logging.rb
 - lib/vx/common/version.rb
 - spec/lib/common/git_spec.rb
 - spec/lib/common/helper/middlewares_spec.rb
-- spec/lib/common/helper/shell_spec.rb
 - spec/lib/common/helper/upload_sh_command_spec.rb
 - spec/lib/common/output_buffer_spec.rb
 - spec/spec_helper.rb
@@ -173,14 +167,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Common code for ci
 test_files:
 - spec/lib/common/git_spec.rb
 - spec/lib/common/helper/middlewares_spec.rb
-- spec/lib/common/helper/shell_spec.rb
 - spec/lib/common/helper/upload_sh_command_spec.rb
 - spec/lib/common/output_buffer_spec.rb
 - spec/spec_helper.rb

data/lib/vx/common/amqp_setup.rb

@@ -1,41 +0,0 @@
-require 'vx/common/amqp'
-require 'vx/common/error_notifier'
-
-module Vx
-  module Common
-
-    module AMQP
-      extend self
-
-      def setup(logger, options = {})
-        Vx::Common::AMQP.configure do |c|
-
-          c.before_subscribe do |e|
-            logger.warn "[#{e[:name]}] subsribing #{e[:exchange].name}"
-          end
-
-          c.after_subscribe do |e|
-            logger.warn "[#{e[:name]}] shutdown"
-          end
-
-          c.before_recieve do |e|
-            logger.warn "[#{e[:name]}] payload recieved #{e[:payload].inspect[0..60]}"
-          end
-
-          c.after_recieve do |e|
-            logger.warn "[#{e[:name]}] commit message"
-          end
-
-          c.on_error do |e|
-            Vx::Common::ErrorNotifier.notify(e)
-          end
-
-          c.content_type = 'application/x-protobuf'
-          c.logger       = nil
-          c.url          = options[:url]
-
-        end
-      end
-    end
-  end
-end

data/lib/vx/common/env_file.rb

@@ -1,24 +0,0 @@
-module Vx
-  module Common
-    module EnvFile
-
-      def read_env_file(file = nil)
-        file ||= '/etc/vexor/ci'
-        file = File.expand_path(file)
-
-        if File.readable?(file)
-          buf  = File.read(file)
-
-          buf.split("\n").each do |line|
-            next if line.strip.empty?
-
-            env, value = line.split("=").map(&:strip)
-            ::ENV[env] = value
-          end
-        end
-
-      end
-
-    end
-  end
-end

data/lib/vx/common/error_notifier.rb

@@ -1,32 +0,0 @@
-require 'airbrake'
-
-module Vx
-  module Common
-
-    class ErrorNotifier
-
-      class << self
-        def notify(error)
-          if setup
-            ::Airbrake.notify(error)
-          end
-        end
-
-        def setup
-          @configured ||= begin
-            return false unless ENV['AIRBRAKE_API_KEY']
-
-            ::Airbrake.configure do |config|
-              config.api_key = ENV['AIRBRAKE_API_KEY']
-              config.host    = ENV['AIRBRAKE_HOST']
-              config.port    = ENV['AIRBRAKE_PORT'] || 80
-              config.secure  = config.port == 443
-            end
-            true
-          end
-        end
-      end
-    end
-
-  end
-end

data/lib/vx/common/helper/shell.rb

@@ -1,83 +0,0 @@
-require 'pathname'
-require 'fileutils'
-require 'tempfile'
-require 'shellwords'
-
-require 'vx/common/spawn'
-
-module Vx
-  module Common
-    module Helper
-
-      module Shell
-
-        private
-
-        include Vx::Common::Spawn
-
-        def path(name)
-          Pathname.new(name)
-        end
-
-        def mkdir(name)
-          FileUtils.mkdir_p name.to_s
-        end
-
-        def rm(name)
-          FileUtils.rm_rf name.to_s
-        end
-
-        def recreate(name)
-          rm name
-          mkdir name
-        end
-
-        def write_file(name, content, perm = 0644)
-          File.open(name, 'w', perm) do |io|
-            io.write content
-          end
-        end
-
-        def write_tmp_file(name, content, perm = 0600)
-          tmp = ::Tempfile.new name
-          tmp.write content
-          tmp.rewind
-          tmp.flush
-          tmp.close
-          FileUtils.chmod perm, tmp.path
-          tmp
-        end
-
-        def read_file(name)
-          if File.readable?(name)
-            File.read name
-          end
-        end
-
-        def expand_path(path)
-          File.expand_path path.to_s
-        end
-
-        def bash(*args, &block)
-          raise ArgumentError, 'block required' unless block_given?
-
-          options = args.last.is_a?(Hash) ? args.pop : {}
-          command = args.first
-
-          cmd = "/usr/bin/env -i HOME=${HOME} bash"
-
-          if file = options.delete(:file)
-            cmd << " #{file}"
-          else
-            cmd << " -c " << Shellwords.escape(command)
-          end
-
-          runner = options.delete(:ssh) || self
-          runner.send(:spawn, cmd, options, &block)
-        end
-
-      end
-
-    end
-  end
-end

data/lib/vx/common/tagged_logging.rb

@@ -1,81 +0,0 @@
-# from activesupport
-
-require 'logger'
-
-module Vx
-  module Common
-    module TaggedLogging
-
-      class Formatter < ::Logger::Formatter
-        Format = "[%s] %1s : %s\n"
-
-        def call(severity, time, progname, msg)
-          Format % [format_datetime(time),
-                    severity[0...1],
-                    msg2str("#{tags_text}#{msg}")]
-        end
-
-        def thread_id
-          Thread.current.object_id
-        end
-
-        def tagged(*tags)
-          new_tags = push_tags(*tags)
-          yield self
-        ensure
-          pop_tags(new_tags.size)
-        end
-
-        def push_tags(*tags)
-          tags.flatten.reject{|i| i.to_s.strip.empty? }.tap do |new_tags|
-            current_tags.concat new_tags
-          end
-        end
-
-        def pop_tags(size = 1)
-          current_tags.pop size
-        end
-
-        def clear_tags!
-          current_tags.clear
-        end
-
-        def current_tags
-          Thread.current[:activesupport_tagged_logging_tags] ||= []
-        end
-
-        private
-
-          def tags_text
-            tags = current_tags
-            if tags.any?
-              tags.collect { |tag| "[#{tag}] " }.join
-            end
-          end
-
-      end
-
-      def self.new(logger)
-        # Ensure we set a default formatter so we aren't extending nil!
-        logger.formatter = Formatter.new
-        logger.extend(self)
-      end
-
-      %w{ push_tags pop_tags clear_tags! }.each do |m|
-        define_method m do
-          formatter.send(m)
-        end
-      end
-
-      def tagged(*tags)
-        formatter.tagged(*tags) { yield self }
-      end
-
-      def flush
-        clear_tags!
-        super if defined?(super)
-      end
-
-    end
-  end
-end

data/spec/lib/common/helper/shell_spec.rb

@@ -1,137 +0,0 @@
-require 'spec_helper'
-
-describe Vx::Common::Helper::Shell do
-
-  let(:klass) { Class.new.tap{|i| i.send :include, described_class } }
-  let(:object) { klass.new }
-
-  subject { object }
-
-  context "path" do
-    it "should create Pathname" do
-      expect_method(:path, '/tmp').to eq Pathname.new('/tmp')
-    end
-  end
-
-  context "mkdir" do
-
-    after { FileUtils.rm_rf '/tmp/.a/' }
-
-    it "should create directories" do
-      expect_method(:mkdir, '/tmp/.a/b/c')
-      expect(File.directory? '/tmp/.a/b/c')
-    end
-  end
-
-  context "rm" do
-    before { FileUtils.mkdir_p '/tmp/.a/b/c' }
-    after  { FileUtils.rm_rf '/tmp/.a' }
-
-    it "should force remove" do
-      expect_method :rm, '/tmp/.a'
-      expect(File.exists? '/tmp/.a').to be_false
-    end
-  end
-
-  context "recreate" do
-    before { FileUtils.mkdir_p '/tmp/.a/b/c' }
-    after  { FileUtils.rm_rf '/tmp/.a' }
-
-    it "should remove and create directory" do
-      expect_method :recreate, '/tmp/.a/b'
-      expect(File.exists? '/tmp/.a/b/c').to be_false
-    end
-  end
-
-  context "write_file" do
-    let(:fname) { '/tmp/.a' }
-    after { FileUtils.rm_f fname }
-
-    it "should write content to file" do
-      expect_method :write_file, fname, 'content', 0611
-      expect(File.readable? fname).to be_true
-      expect(File.read fname).to eq 'content'
-    end
-  end
-
-  context "write_tmp_file" do
-    let(:tmp_file) { object.send :write_tmp_file, 'fname', 'content', 0611 }
-
-    after { FileUtils.rm_f tmp_file.path }
-
-    it "should create tmp file and write content" do
-      expect(tmp_file).to be
-      expect(File.readable? tmp_file.path).to be_true
-      expect(File.read tmp_file.path).to eq 'content'
-    end
-  end
-
-  context "read_file" do
-    let(:fname) { '/tmp/.a' }
-    before do
-      File.open fname, 'w' do |io|
-        io << "content"
-      end
-    end
-    after { FileUtils.rm_f fname }
-
-    it "should read file" do
-      expect_method(:read_file, fname).to eq 'content'
-    end
-
-    context "when file does not exists" do
-      it "should return nil" do
-        expect_method(:read_file, 'not_exists').to be_nil
-      end
-    end
-  end
-
-  context "bash" do
-    let(:output) { '' }
-
-    context "when command is string" do
-      it "should spawn bash command and return exit code" do
-        expect_method(:bash, "echo $HOME", &method(:add_to_output)).to eq 0
-        expect(output).to eq ENV['HOME'] + "\n"
-      end
-    end
-
-    context "when command is a file" do
-      let(:fname) { '/tmp/.a' }
-
-      before do
-        File.open fname, 'w' do |io|
-          io << "echo $HOME"
-        end
-      end
-
-      after { FileUtils.rm_f fname }
-
-      it "should spawn bash, execute file and return exit code" do
-        expect_method(:bash, file: fname, &method(:add_to_output)).to eq 0
-      end
-    end
-
-    context "when :ssh options passed" do
-      let(:ssh) { 'ssh' }
-
-      before do
-        mock(ssh).spawn("/usr/bin/env -i HOME=${HOME} bash -c command", {}) { 0 }
-      end
-
-      it "should execute command thougth :ssh" do
-        expect_method(:bash, 'command', ssh: ssh, &method(:add_to_output)).to eq 0
-      end
-
-    end
-
-    def add_to_output(out)
-      output << out
-    end
-  end
-
-  def expect_method(name, *args, &block)
-    expect(object.send(name, *args, &block))
-  end
-
-end