traquitana 0.1.1 → 0.1.6

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.1"
+  VERSION = "0.1.6"
 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

data/spec/cleaner_spec.rb

@@ -1,22 +1,23 @@
-require "minitest/autorun"
+require 'minitest/autorun'
+require 'minitest/focus'
 require "#{File.expand_path(File.dirname(__FILE__))}/../lib/traquitana.rb"
 
 describe Traquitana::Cleaner do
-   before do
-      @cleaner = Traquitana::Cleaner.new 
-      @config  = Traquitana::Config.instance
-      @config.load
-   end
+  before do
+    @cleaner = Traquitana::Cleaner.new 
+    @config  = Traquitana::Config.instance
+    @config.load
+  end
 
-   it "should have a run method" do
-      @cleaner.must_respond_to :run  
-   end
+  it 'should have a run method' do
+    expect(@cleaner).must_respond_to :run  
+  end
 
-   it "should run cleaner on remote host" do
-      network = MiniTest::Mock.new
-      network.expect(:execute,nil,[["find #{@config.directory}/traq -type f -iname '*.zip' -o -iname '*.list' | sort | head -n-2 | xargs rm $1"]])
-      @cleaner.network = network
-      @cleaner.run
-      network.verify
-   end
+  it 'should run cleaner on remote host' do
+    network = MiniTest::Mock.new
+    network.expect(:execute, nil, [["find #{@config.directory}/traq -type f -iname '*.zip' -o -iname '*.list' | sort | head -n-2 | xargs rm $1"]])
+    @cleaner.network = network
+    @cleaner.run
+    network.verify
+  end
 end

data/spec/config/Gemfile

@@ -1,3 +1,6 @@
 source 'http://rubygems.org'
 
+ruby '2.7.2'
+
 gem 'memoize'
+gem 'rake'

data/spec/config/Rakefile

@@ -0,0 +1,11 @@
+namespace 'db' do
+  task :migrate do
+    STDOUT.puts "running migrations ..."
+  end
+end
+
+namespace 'assets' do
+  task :precompile do
+    STDOUT.puts "precompiling assets ..."
+  end
+end

data/spec/config/config/traq.yml

@@ -11,6 +11,7 @@ list:
 - - config/environments/production.rb
 - - config/locales/**/*
 - - config/routes.rb
+- - config/storage.yml
 - - app/**/*
 - - db/migrate/**/*
 - - public/javascripts/**/*

data/spec/config_spec.rb

@@ -1,109 +1,114 @@
-require "yaml"
-require "fileutils"
-require "minitest/autorun"
+require 'yaml'
+require 'fileutils'
+require 'minitest/autorun'
+require 'minitest/focus'
 require "#{File.expand_path(File.dirname(__FILE__))}/../lib/traquitana.rb"
 
 describe Traquitana::Config do
-   before do
-      @config = Traquitana::Config.instance
-   end
-
-   describe "paths" do
-      it "should have a filename getter method" do
-         @config.must_respond_to(:filename)   
-      end
-
-      it "should have a filename called traq.yml if file name is not set" do
-         File.basename(@config.filename).must_equal("traq.yml")
-      end
-
-      it "should have a filename setter method" do
-         @config.must_respond_to(:filename=)
-      end
-
-      it "should have a custom filename if filename is set" do
-         old    = @config.filename
-         custom = "config/custom.yml"
-         @config.filename = custom
-         @config.filename.must_equal custom
-         @config.filename = old
-      end
-
-      it "should have a default file method" do
-         @config.must_respond_to(:default)
-      end
-
-      it "should have a valid directory" do
-        @config.directory.wont_be_nil
-        (@config.directory.size > 0).must_equal true
-      end
-   end
-
-   describe "configs" do
-      it "should respond to configuration dynamic methods" do
-         @config.banana.must_equal ""
-      end
-
-      it "should respond with the correct value" do
-         @config.load
-         @config.user.must_equal "taq"
-      end
-
-      it "should have basic information on the default file" do
-         contents = YAML.load(File.read(@config.default))
-         contents["directory"].wont_be_nil
-         contents["server"].wont_be_nil
-         contents["list"].wont_be_nil
-         contents["host"].wont_be_nil
-      end
-   end
-
-   describe "setup" do
-      it "should have a method named setup" do
-         @config.must_respond_to(:setup)
-      end
-
-      it "should do nothing if the configuration file exists" do
-         @config.setup.must_equal false
-      end
-
-      it "should write the configuration file if it doesn't exists" do
-         contents = File.read(@config.filename)
-         File.unlink(@config.filename)
-
-         assert !File.exists?(@config.filename)
-         @config.setup.must_equal true
-         assert File.exists?(@config.filename)
-
-         File.open(@config.filename,"w") {|file| file << contents}
+  before do
+    @config = Traquitana::Config.instance
+  end
+
+  describe 'paths' do
+    it 'should have a filename getter method' do
+      expect(@config).must_respond_to :filename
+    end
+
+    it 'should have a filename called traq.yml if file name is not set' do
+      expect(File.basename(@config.filename)).must_equal('traq.yml')
+    end
+
+    it 'should have a filename setter method' do
+      expect(@config).must_respond_to :filename=
+    end
+
+    it 'should have a custom filename if filename is set' do
+      old    = @config.filename
+      custom = 'config/custom.yml'
+
+      @config.filename = custom
+      expect(@config.filename).must_equal custom
+      @config.filename = old
+    end
+
+    it 'should have a default file method' do
+      expect(@config).must_respond_to :default
+    end
+
+    it 'should have a valid directory' do
+      expect(@config.directory).wont_be_nil
+      expect(@config.directory.size > 0).must_equal true
+    end
+  end
+
+  describe 'configs' do
+    it 'should respond to configuration dynamic methods' do
+      expect(@config.banana).must_equal ''
+    end
+
+    it 'should respond with the correct value' do
+      @config.load
+      expect(@config.user).must_equal 'taq'
+    end
+
+    it 'should have basic information on the default file' do
+      contents = YAML.load(File.read(@config.default))
+      expect(contents['directory']).wont_be_nil
+      expect(contents['server']).wont_be_nil
+      expect(contents['list']).wont_be_nil
+      expect(contents['host']).wont_be_nil
+    end
+  end
+
+  describe 'setup' do
+    it 'should have a method named setup' do
+      expect(@config).must_respond_to :setup
+    end
+
+    it 'should do nothing if the configuration file exists' do
+      expect(@config.setup).must_equal false
+    end
+
+    it 'should write the configuration file if it doesnt exists' do
+      contents = File.read(@config.filename)
+      File.unlink(@config.filename)
+
+      expect(File.exists?(@config.filename)).must_equal false
+      expect(@config.setup).must_equal true
+      expect(File.exists?(@config.filename)).must_equal true
+
+      File.open(@config.filename, 'w') do |file| 
+        file << contents
       end
-   end
-
-   describe "targets" do
-      it "should have a target readable attribute" do
-         @config.must_respond_to :target
+    end
+  end
+
+  describe 'targets' do
+    it 'should have a target readable attribute' do
+      expect(@config).must_respond_to :target
+    end
+
+    it 'should have a target writable attribute' do
+      expect(@config).must_respond_to :target=
+    end
+
+    it 'should load custom target config' do
+      begin
+        @config.filename = 'config/custom.yml'
+        @config.target   = 'custom'
+        @config.load
+        expect(@config.directory).must_equal '/tmp/traq_test_custom'
+      ensure
+        reset_config
       end
+    end
+  end
 
-      it "should have a target writable attribute" do
-         @config.must_respond_to :target=
-      end
+  private
 
-      it "should load custom target config" do
-         begin
-            @config.filename = "config/custom.yml"
-            @config.target   = "custom"
-            @config.load
-            @config.directory.must_equal "/tmp/traq_test_custom"
-         ensure
-            reset_config
-         end
-      end
-   end
-
-   private
-   def reset_config
-      @config.filename = "config/traq.yml"
-      @config.target   = nil
-      @config.load
-   end
+  def reset_config
+    @config.filename = 'config/traq.yml'
+    @config.target   = nil
+    @config.load
+  end
 end