traquitana 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cc5790aa33dcaa9804f40610737d69783f1d89f8d816b8b12c74fd2edbd899c
-  data.tar.gz: 0c052749bb7d4dd6a49c9bbd6c373ded671c420098f094dac13fd6e784d57427
+  metadata.gz: 7a09adad4f736aa9f57f8c93aed0b5358ab64b07c5360307022409a9a8a26abf
+  data.tar.gz: 8c085c94a9a4bd2bfcdb4871f46ccdc64d4d1e08fddd903904c3ac5b111b71be
 SHA512:
-  metadata.gz: 7e5057bd9837ec5d161f103dc51eed0528ad627d34bdf03e7e5ec18f8ef1e4d926e1ad744774172fc5f1260cd773f2ad7bdd9b37c4152f7a22a7ff37d821e5f6
-  data.tar.gz: 7dea62c9d57aa7babeb95daa966d98141c29962291562660d78add79d86f1c3103876118293a525365874d796dc8b7d6f0ea3e76dc09e202af00c89dbec74045
+  metadata.gz: 4d78781ee2800bb9f4a0bbc3b71e3d95acec09d3684bddfb0c7f9f89086b66413d1b535a3166bed619beefc4e2110dac8ff7b20b31260e2fe8b5f3434f4eb7f3
+  data.tar.gz: 80fcf9ca6561c01b878aebef8abb754d4ca81ea8af9465017f97ef6e301df948dff7f32de477f30dc062555ee7cfb5cf5419926cf59739a9758a5a08084115d7

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    traquitana (0.1.0)
+    traquitana (0.1.3)
       highline
       net-scp
       net-ssh
-      rubyzip (>= 1.0.0)
+      rubyzip (>= 2.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    highline (1.7.8)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (4.1.0)
-    rubyzip (1.2.1)
+    highline (2.0.3)
+    net-scp (2.0.0)
+      net-ssh (>= 2.6.5, < 6.0.0)
+    net-ssh (5.2.0)
+    rubyzip (2.0.0)
 
 PLATFORMS
   ruby
@@ -23,4 +23,4 @@ DEPENDENCIES
   traquitana!
 
 BUNDLED WITH
-   1.14.6
+   1.17.2

data/README.md

@@ -95,6 +95,7 @@ There are some command line options:
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+3. Test it! Run `$ rake test`. You need `minitest` and `minitest-focus`.
+4. Commit your changes (`git commit -am 'Added some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create new Pull Request

data/bin/traq

@@ -1,45 +1,45 @@
 #!/usr/bin/env ruby
 
-require "rubygems"
-require "yaml"
-require "zip"
-require "net/scp"
-require "net/ssh"
-require "fileutils"
-require "optparse"
-require File.dirname(File.expand_path(__FILE__))+"/../lib/traquitana.rb"
+require 'rubygems'
+require 'yaml'
+require 'zip'
+require 'net/scp'
+require 'net/ssh'
+require 'fileutils'
+require 'optparse'
+require File.dirname(File.expand_path(__FILE__)) + '/../lib/traquitana.rb'
 
-@options = {:verbose=>false}
+@options = { verbose: false }
 
 opts = OptionParser.new
-opts.banner = "Usage: traq [options] <setup>"
+opts.banner = 'Usage: traq [options] <setup>'
 
-opts.on("-v","--version","Show version") do 
-   puts Traquitana::VERSION
-   exit 0
+opts.on('-v', '--version', 'Show version') do
+  puts Traquitana::VERSION
+  exit 0
 end
 
-opts.on("-c","--cleanup","Clean up old files") do 
-   Traquitana::Cleaner.new.run
-   exit 0
+opts.on('-c', '--cleanup', 'Clean up old files') do
+  Traquitana::Cleaner.new.run
+  exit 0
 end
 
-opts.on("-V","--verbose","Verbose mode") do 
-   @options[:verbose] = true
+opts.on('-V', '--verbose', 'Verbose mode') do
+  @options[:verbose] = true
 end
 
-opts.on("-f","--file file","Config file") do |file|
-   @options[:filename] = file
+opts.on('-f', '--file file', 'Config file') do |file|
+  @options[:filename] = file
 end
 
-opts.on("-t","--target target","Target") do |target|
-   @options[:target] = target
+opts.on('-t', '--target target', 'Target') do |target|
+  @options[:target] = target
 end
 
 opts.parse!
 
 if ARGV[0] =~ /setup/
-   Traquitana::Config.instance.setup
-else   
-   Traquitana::Deployer.new(@options).run
-end   
+  Traquitana::Config.instance.setup
+else
+  Traquitana::Deployer.new(@options).run
+end

data/gem-public_cert.pem

@@ -1,26 +1,26 @@
 -----BEGIN CERTIFICATE-----
 MIIEVjCCAr6gAwIBAgIBATANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDDB9ldXN0
-YXF1aW9yYW5nZWwvREM9Z21haWwvREM9Y29tMB4XDTE4MTExNDIwNTMxMVoXDTE5
-MTExNDIwNTMxMVowKjEoMCYGA1UEAwwfZXVzdGFxdWlvcmFuZ2VsL0RDPWdtYWls
-L0RDPWNvbTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKKJMledxeWV
-5zzrIQ0NEfSOANd/P6MXg8j7nkO0huQDrk856B1/7I7oQkWy90xJJrBimaWuLGN8
-gcWQMNCr2RIRvoMirlAdQOrKgRcvUludBfGYOLtxnPVXuuaMuyike9jY50ba2ROP
-04sTU3G18f7EF4+NTkqbN2lGedlyFtqX8+uGDAhiM7TV4agUU2p38043U1qudowR
-8VmXzGwSLMsrzqsH3fqT7ZsZG/GdZl2xEqP6TjmbsSEuxLidxS2xWMjGXd6/Coxb
-8O4zrwNPpO7ftFYdZJaUm9f1Hh6g2tVBY46boZSOFkuCQ2RQetj6mtVdGcGrDa5E
-rveDSpl/hxgnUDA38NQRX2dsWijrgOC/Ha91p6Qu60lTR/2wHaZu66ioKjY7EWHY
-dT0H76xOuS7VZHlx/eI0wpLHNtPoLnVCfYRkeHliRbjnvi1L/MGVlmVZg51Bnecd
-RBxF63wq2lGfWKki/9dG7DWiFb2MT2ul0BNnYyQDgjPnhJ4L7K8C9QIDAQABo4GG
-MIGDMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQxasHyljikW4ot
-0tdx9nyfWQF89zAkBgNVHREEHTAbgRlldXN0YXF1aW9yYW5nZWxAZ21haWwuY29t
+YXF1aW9yYW5nZWwvREM9Z21haWwvREM9Y29tMB4XDTE5MTEyNzEzMDUyNVoXDTIw
+MTEyNjEzMDUyNVowKjEoMCYGA1UEAwwfZXVzdGFxdWlvcmFuZ2VsL0RDPWdtYWls
+L0RDPWNvbTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAL0m1eB2AEOm
+l/LHYuLDv05uoaiJaoHRdDcxnATueUGVbGn97fiv1+d2xoXF66a3gww3Apn6vpTY
+x4aTH11NVNdu9m5MGgHPiIqp8rNtyDt538OncgaTGKLOjUZW8jHGxk1/9y22gBYn
+XCbLfIciPVOZV39hL5JHdy8obezijs+4TsUE8S5uFyiYGIL1eARyxPWWUENW9x2x
+scEAW89hJ4tV+49I1UIqfIMKJb7dStiQM+HlBzNf7GkTwzaETHZEyCa7LdfiPI/s
+iwW/mSoJx5997j6twsIKBVifYk/MEQjQkaLymgYu3CJ7qMaBGYAAJDZGATYt3SvC
+HMTYhvG7qvbHtBWMeRwvSqNfsj39o59HL53H2G+jfNKpjb/TfRsBBzdGXobFLcH0
+w91+QoFCquN0aNL6IRSY6hIwinIGGuggWEwp5jmPcYjav0I3tszV5iSxXreURX8S
+KP+FR/LVd9lgeiNEcmpdkbNoQ1dd7RrRfFVOEcrqaiScRsCCZnMoHQIDAQABo4GG
+MIGDMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBRjzyGZfZ3j8BiB
++cEsJb0Lg6tz3jAkBgNVHREEHTAbgRlldXN0YXF1aW9yYW5nZWxAZ21haWwuY29t
 MCQGA1UdEgQdMBuBGWV1c3RhcXVpb3JhbmdlbEBnbWFpbC5jb20wDQYJKoZIhvcN
-AQELBQADggGBAFViFXyuU/Malv+g97NzSWYZPgz8cMNwJyMVO/MICcwGA89dijVD
-mnZ7GeZNDL/i3HF6/ksPnBZ00y09i4IE9+MtqmytY2o+9IvPjVlgiv9F9xTfRAwb
-XxQPI7dF0bYSwKlXqv28FuvZRe57uFZHcaVP43yWvb/IVACyIhWARhrowS8l+hG4
-bAGIffl2UJuGzlAX5QlCdPtrgq3dEg4CuNOHVNdYrMJw4sFC0i+9P3JaHHtJgmb+
-KvXHj7kxToggX8nNpwjQyCMgDWqxGJDBwjJy5C/9xgwZ8DH8FaXnpoWdeItJYoH7
-Kp/lK9z+cWZ8Rix853xtXu/ZVJaHeOPqGIqDC6iZYbU/QtXGZAVKsjV7odQOKyZd
-NUFwMoiTOEwHzNW6KJMPKfjXiE3axgsx5II/Rn70CiAuUbx1gpV6uJWPMCZ6Nxel
-CFEOX0+zy4NfUYoiVqmaIXXlQX+hUOkeqYxgCEsGi5C6Ycf5eKlmLMTUBSfKyg8O
-PM/xM6zipwKquQ==
+AQELBQADggGBAHuTzyu0cDGVRsONr7PgY9eahH0ZGy/bdrk0FO0RpAOXayjsmmL2
+Ouoi8VbWRzVtDvbQdU4bcsUnWkOMLImhlLs1VKAhOVxnV0ZGdyNQfLV1SXMAJkgc
+AI7ClhA1YVBO70NaOyJPjaXs+lc4PltdEF59+YDCIVjAAoQd31F7x+eO2pjr+Mu1
+yH5aCyn1BwklE7TF8076SZK4MNLeD/KD3whOjL0k1xeQqAqaImf+oxDbhU3tJCEd
+dfcBNOr98LHzsGEYQRB24Ksnw7dcEqWs/trbJrgA7lX2/8TAch5fSLgVDQwSLPk7
+E34l4xf0bry+lF2zuD15Mps1ZDxJhKcgDWNg82huuVh1zqzNYqgWB1hYPBehhXGo
+NdMU5fm01/k08H5psRBGWS/EcpX063ll3qcOGVqbPPH2U3LCYzWww+2PdslwJo/c
+uek3m7n2XoRODoAGEm3apnmP8WWMEmI0tXdsvDBwoNVXEMkFnxD+RIMQPW22r3ZL
+waOiThAR0oxaTQ==
 -----END CERTIFICATE-----

data/lib/bar.rb

@@ -5,7 +5,7 @@ module Traquitana
 
     def initialize
       reset
-    end      
+    end
 
     def reset
       @name     = nil

data/lib/cleaner.rb

@@ -11,9 +11,9 @@ module Traquitana
     end
 
     def run
-      STDOUT.print "Cleaning old files ... "
+      STDOUT.print 'Cleaning old files ... '
       @network.execute(["find #{@config.directory}/traq -type f -iname '*.zip' -o -iname '*.list' | sort | head -n-2 | xargs rm $1"])
-      STDOUT.puts "done."
+      STDOUT.puts 'done.'
     end
   end
 end

data/lib/config.rb

@@ -1,4 +1,4 @@
-require "singleton"
+require 'singleton'
 
 module Traquitana
   class Config
@@ -7,7 +7,7 @@ module Traquitana
 
     def initialize
       @configs  = {}
-      @filename = "config/traq.yml"
+      @filename = 'config/traq.yml'
       @target   = nil
       load
     end
@@ -23,22 +23,22 @@ module Traquitana
     end
 
     def method_missing(meth)
-      @configs[meth.to_s] || ""
+      @configs[meth.to_s] || ''
     end
 
     def setup
-      STDOUT.puts "Running setup"
+      STDOUT.puts 'Running setup'
 
       if File.exists?(self.filename)
         STDERR.puts "The configuration file #{self.filename} already exists."
         return false
       end
 
-      dir = File.dirname(self.filename)
+      dir = File.dirname(filename)
       Dir.mkdir(dir) if !File.exist?(dir)
 
-      STDOUT.puts "Writing #{self.filename}"
-      File.open(self.filename, "w") do |file|
+      STDOUT.puts "Writing #{filename}"
+      File.open(filename, "w") do |file|
         file << File.read(self.default)
       end
 
@@ -48,6 +48,7 @@ module Traquitana
     end
 
     private
+
     def check_configs(file)
       @configs = YAML.load(File.read(file || self.filename)) rescue nil
       STDERR.puts "Configs not found (tried '#{file}' and '#{self.filename}')" if !@configs

data/lib/deployer.rb

@@ -1,20 +1,19 @@
 module Traquitana
   class Deployer
-    def initialize(options=nil)
+    def initialize(options = nil)
       @config          = Traquitana::Config.instance
       @verbose         = !options.nil? && options[:verbose]
-      @config.filename = options[:filename] if options[:filename]
+      @config.filename = file(options)
       @config.target   = options[:target]   if options[:target]
     end
 
     def run
       STDOUT.puts "\e[1mRunning Traquitana version #{VERSION}\e[0m\n\n"
-      Traquitana::Migrator.new.run
 
-      if !File.exist?(@config.filename)
-        STDERR.puts "\e[31mNo config file (#{@config.filename}) found."	
-        STDERR.puts "Did you run \e[1mtraq setup\e[0;31m ?"
-        STDERR.puts "Run it and check the configuration before deploying.\e[0m"
+      unless File.exist?(@config.filename)
+        warn "\e[31mNo config file (#{@config.filename}) found."	
+        warn "Did you run \e[1mtraq setup\e[0;31m ?"
+        warn "Run it and check the configuration before deploying.\e[0m"
         exit 1
       end
 
@@ -30,7 +29,7 @@ module Traquitana
       all_list_file, all_list_zip = @packager.pack
 
       if !File.exists?(all_list_file) || !File.exists?(all_list_zip)
-        STDERR.puts "\e[31mCould not create the needed files.\e[0m"
+        warn "\e[31mCould not create the needed files.\e[0m"
         exit 2
       end
 
@@ -59,5 +58,13 @@ module Traquitana
       File.unlink(all_list_zip)
       STDOUT.puts "\e[32mAll done. Have fun.\e[0m\n"
     end
+
+    private
+
+    def file(options)
+      return options[:filename] if options[:filename]
+
+      @config.filename
+    end
   end
 end

data/lib/packager.rb

@@ -1,14 +1,14 @@
-require "tmpdir"
-require "zip"
+require 'tmpdir'
+require 'zip'
 
 module Traquitana
   class Packager
     attr_reader   :id
     attr_accessor :verbose
 
-    def initialize(dir = "")
+    def initialize(dir = '')
       @dir     = dir
-      @id      = Time.now.strftime("%Y%m%d%H%M%S%L")
+      @id      = Time.now.strftime('%Y%m%d%H%M%S%L')
       @verbose = verbose
     end
 
@@ -21,24 +21,30 @@ module Traquitana
     end
 
     def pack
-      list_path   = "#{Dir.tmpdir}/#{self.list_file}"
-      zip_path    = "#{Dir.tmpdir}/#{self.zip_file}"
-      list        = Traquitana::Selector.new(@dir).files
-      regex       = @dir.to_s.size < 1 ? "" : Regexp.new("^#{@dir}") 
+      list_path = "#{Dir.tmpdir}/#{self.list_file}"
+      zip_path  = "#{Dir.tmpdir}/#{self.zip_file}"
+      list      = Traquitana::Selector.new(@dir).files
+      regex     = @dir.to_s.size < 1 ? '' : Regexp.new("^#{@dir}")
 
       # write list file
       STDOUT.puts "Creating the list file: #{list_path}" if @verbose
-      File.open(list_path, "w") {|file| file << list.map { |f| f.sub(regex,"") }.join("\n") }
+
+      File.open(list_path, 'w') do |file|
+        file << list.map do |f|
+          f.sub(regex, '')
+        end.join("\n")
+      end
 
       # write zip file
       STDOUT.puts "Creating the zip file : #{zip_path}" if @verbose
-      Zip::File.open(zip_path, "w") do |zip_file|
+
+      Zip::File.open(zip_path, 'w') do |zip_file|
         for file in list
-          strip = file.sub(regex, "")
+          strip = file.sub(regex, '')
           zip_file.add(strip, file)
         end
       end
-      [ list_path, zip_path ]
+      [list_path, zip_path]
     end
   end
 end

data/lib/selector.rb

@@ -1,6 +1,6 @@
 module Traquitana
   class Selector
-    def initialize(dir = "")
+    def initialize(dir = '')
       @dir = dir
     end
 

data/lib/ssh.rb

@@ -33,7 +33,7 @@ module Traquitana
                   channel.send_data("#{pwd}\n")
                   sleep 0.1
                 else
-                  puts msg if msg.size > 1
+                  STDOUT.puts msg if msg.size > 1
                 end
                 chd.wait
               end

data/lib/traquitana.rb

@@ -1,3 +1,3 @@
-%w(traquitana/version config selector deployer packager ssh bar migrator cleaner).each do |file|
+%w(traquitana/version config selector deployer packager ssh bar cleaner).each do |file|
    require File.dirname(__FILE__)+"/"+file
 end

data/lib/traquitana/version.rb

@@ -1,3 +1,3 @@
 module Traquitana
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/bar_spec.rb

@@ -1,45 +1,52 @@
-require "minitest/autorun"
+require 'minitest/autorun'
 require "#{File.expand_path(File.dirname(__FILE__))}/../lib/traquitana.rb"
 
 describe Traquitana::Bar do
-   before do
-      @bar = Traquitana::Bar.new
-      @bar.total = 100
-   end
-
-   describe "limits" do
-      it "should have a total" do
-         @bar.must_respond_to :total
-      end
-      it "should have a current value" do
-         @bar.must_respond_to :current
-      end
-   end
-
-   describe "updates" do
-      it "should have a name" do
-         @bar.must_respond_to :name
-      end
-      it "should have a update method" do
-         @bar.must_respond_to :update
-      end
-      it "should have a indicator method" do
-         @bar.must_respond_to :indicator
-      end
-      it "should return the correct string for 0%" do
-         @bar.indicator(0).must_equal "____________________"
-      end
-      it "should return the correct string for 25%" do
-         @bar.indicator(25).must_equal "#####_______________"
-      end
-      it "should return the correct string for 50%" do
-         @bar.indicator(50).must_equal "##########__________"
-      end
-      it "should return the correct string for 75%" do
-         @bar.indicator(75).must_equal "###############_____"
-      end
-      it "should return the correct string for 100%" do
-         @bar.indicator(100).must_equal "####################"
-      end
-   end
+  before do
+    @bar       = Traquitana::Bar.new
+    @bar.total = 100
+  end
+
+  describe 'limits' do
+    it 'should have a total' do
+      expect(@bar).must_respond_to :total
+    end
+    it 'should have a current value' do
+      expect(@bar).must_respond_to :current
+    end
+  end
+
+  describe 'updates' do
+    it 'should have a name' do
+      expect(@bar).must_respond_to :name
+    end
+
+    it 'should have a update method' do
+      expect(@bar).must_respond_to :update
+    end
+
+    it 'should have a indicator method' do
+      expect(@bar).must_respond_to :indicator
+    end
+
+    it 'should return the correct string for 0%' do
+      expect(@bar.indicator(0)).must_equal '____________________'
+    end
+
+    it 'should return the correct string for 25%' do
+      expect(@bar.indicator(25)).must_equal '#####_______________'
+    end
+
+    it 'should return the correct string for 50%' do
+      expect(@bar.indicator(50)).must_equal '##########__________'
+    end
+
+    it 'should return the correct string for 75%' do
+      expect(@bar.indicator(75)).must_equal '###############_____'
+    end
+
+    it 'should return the correct string for 100%' do
+      expect(@bar.indicator(100)).must_equal '####################'
+    end
+  end
 end