traquitana 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5b78ac5ff06eb7b7e1527258db12ffabadc397ae
-  data.tar.gz: 7925b9da4884f59b947455ed9087ef5b2d988b09
+SHA256:
+  metadata.gz: 6fdc190124c932c15410e7994dd52801913b9846662596b886fa3b96ec886ff7
+  data.tar.gz: 194e6f942110bd6ea3f81109af4c30dcb8eb4c12c88604894608bee0cd5635c4
 SHA512:
-  metadata.gz: f2ba4cb51e75fe84218c44b13ff2e3aab8788dd86285ee5125a22eb70305e056be0fa9d000c5ccecc8c814a0ecd043cb464fcb558f6c3bf658f8e4ad4f5a3e76
-  data.tar.gz: 44a0598ba79dad52cb4da7fd2ec1862281ef499b80e1962ff93c3ac2d85859466193c04d9c05a310dcaa228947d35bc473e7a8dd929acdb3a23b030a49f886c5
+  metadata.gz: b8ef43b8ad6fe8fd7b3327ece03c7c23679797cab4bad48ad397fee4c4ec038f591c4f39f34df6e0bf7abc44c1fa5c1c531035bab908e7d2155b67f6f21ab138
+  data.tar.gz: e329d4b28d85fe6b3831697dfbae6b327ca954cde52e167cb34a85847c9bae44304d3ffad808be0e771607482de160f97b1dafe4ecf523108665a5bf195e5d09

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

@@ -1,16 +1,13 @@
-- [![Downloads](https://img.shields.io/gem/dt/traquitana.svg)](https://rubygems.org/gems/traquitana)
-- [![Version](https://img.shields.io/gem/v/traquitana.svg)](https://rubygems.org/gems/traquitana)
-- [![License](https://img.shields.io/badge/license-GPLV2-brightgreen.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+[![Downloads](https://img.shields.io/gem/dt/traquitana.svg)](https://rubygems.org/gems/traquitana)
+[![Version](https://img.shields.io/gem/v/traquitana.svg)](https://rubygems.org/gems/traquitana)
+[![License](https://img.shields.io/badge/license-GPLV2-brightgreen.svg)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
 
 # Traquitana
 
 This project is a collection of scripts I used before met Capistrano and the
-other tools to do that.
-It send some files from your local Rails app directory to a production remote
-server, using some
-default libs on Ruby like net/ssh and net/scp, and rubyzip to zip all the files
-and try to make
-things faster.
+other tools to do that.  It send some files from your local Rails app directory
+to a production remote server, using some default libs on Ruby like net/ssh and
+net/scp, and rubyzip to zip all the files and try to make things faster.
 
 It was made to run on GNU/Linux, but should work on similar systems. 
 
@@ -18,15 +15,21 @@ It was made to run on GNU/Linux, but should work on similar systems.
 
 Add this line to your application's Gemfile:
 
-    gem 'traquitana'
+```
+gem 'traquitana'
+```
 
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install traquitana
+```
+$ gem install traquitana
+```
 
 ## Usage
 
@@ -44,8 +47,10 @@ Or install it yourself as:
 
 	On the list can have two elements by row, like:
 
-      - - public/images/**/*
-        - public/images/uploads/**/*
+```
+- - public/images/**/*
+  - public/images/uploads/**/*
+```
 
    On this example, all below public/images will be send BUT ignoring what is on
    public/images/uploads. This is a way to make sure you'll not overwrite some
@@ -60,7 +65,7 @@ Or install it yourself as:
   specify any tags. Take a look on the custom.yml file provided and use
   -t or --target <target>.
 
-- Run traq (just type traq). 
+- Run traq (just type `traq`). 
 	- It will search for changed files
 	- Will create a list with the file names found
 	- Will zíp the files.
@@ -85,16 +90,27 @@ break something.
 
 There are some command line options:
 
-* -f or --file <file> - specify the config file path
-* -v or --version - show current version
-* -c or --cleanup - clean old versions backups stored on the remote host
-* -v or --verbose - be verbose while running
-* -t or --target <target> - specify which target will be loaded on the config file
+* `-f` or `--file <file>` - specify the config file path
+* `-v` or `--version` - show current version
+* `-c` or `--cleanup` - clean old versions backups stored on the remote host
+* `-v` or `--verbose` - be verbose while running
+* `-t` or `--target <target>` - specify which target will be loaded on the config file
+
+## Drawbacks
+
+As we're sending the local files to the server, if you deleted some file from
+your local repository, **it will not be deleted from your server**, so, you'll
+need to take care of this by yourself. I was inclined to check for the deleted
+files on the file list sent to the server, comparing with the local files there,
+and then delete the files, but I think file deletion could be a little more
+invasive than I'd would like about how this gem works. Maybe on future I can
+change my mind.
 
 ## Contributing
 
 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'll 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/config/custom.yml

@@ -1,5 +1,5 @@
-# Default configuration
-default:
+# This is the default configuration, created by the traq setup command
+default: &default
    directory: /tmp/traq_test
    user: taq
    list: 
@@ -12,6 +12,7 @@ default:
    - - config/environments/production.rb
    - - config/locales/**/*
    - - config/routes.rb
+   - - config/storage.yml
    - - app/**/*
    - - db/migrate/**/*
    - - public/javascripts/**/*
@@ -24,27 +25,13 @@ default:
    host: localhost
    server: passenger
    shell: bash -l -c 
+
+# This is a custom configuration to be used wit -t or --target option. 
+# It inherits all the default configs, just changing the directory.
+# It can be used like:
+# $ traq -t custom
+# or
+# $ traq --target custom
 custom:
+   <<: *default
    directory: /tmp/traq_test_custom
-   user: taq
-   list: 
-   - Rakefile
-   - config.ru
-   - Gemfile
-   - - config/application.rb
-   - - config/environment.rb
-   - - config/initializers/**/*
-   - - config/environments/production.rb
-   - - config/locales/**/*
-   - - config/routes.rb
-   - - app/**/*
-   - - db/migrate/**/*
-   - - public/javascripts/**/*
-   - - public/stylesheets/**/*
-   - - lib/**/*
-   - - bin/**/*
-   - - public/images/**/*
-     - public/images/uploads/**/*
-   password: fill your password here
-   host: localhost
-   shell: bash -l -c 

data/config/default.yml

@@ -14,6 +14,7 @@ list:
 - - config/boot.rb
 - - config/database.yml
 - - config/secrets.yml
+- - config/storage.yml
 - - app/**/*
 - - db/migrate/**/*
 - - db/seeds.rb

data/config/proc.sh

@@ -134,6 +134,15 @@ function migrate() {
    fi
 }
 
+#
+# Check if the channels dir exists
+#
+function channels() {
+   if [ ! -d app/assets/javascripts/channels ]; then
+      mkdir -p app/assets/javascripts/channels
+   fi
+}
+
 #
 # Precompile assets if needed
 #
@@ -193,6 +202,47 @@ function sanity_check() {
   fi
 }
 
+function activate_gems() {
+   msg "Activating gems on $(pwd) ..."
+
+   local GEMFILE_VERSION=""
+
+   if [ -z "$GEMFILE_VERSION" ] && [ -f Gemfile ]; then
+      msg "Trying find Ruby version on Gemfile ..."
+      GEMFILE_VERSION=$(grep -e "^ruby" Gemfile | cut -f2 -d' ' | tr -d "'")
+   fi
+
+   if [ -z "$GEMFILE_VERSION" ] && [ -f .ruby-version ]; then
+      msg "Trying find Ruby version on .ruby-version file ..."
+      GEMFILE_VERSION=$(cat .ruby-version)
+   fi
+
+   if [ -z "$GEMFILE_VERSION" ]; then
+      msg "\e[31mCould not determine Ruby version.\e[0m"
+      return
+   fi
+
+   local PROVIDER=$(gem_provider)
+   local RVM_LOCAL=$HOME/.rvm/scripts/rvm
+   local RVM_SYSTEM=/usr/local/rvm/scripts/rvm
+   local RVM_SOURCE=""
+
+   if [ "$PROVIDER" == "rvm" ]; then
+      msg "Activating $GEMFILE_VERSION on RVM ..."
+
+      if [ -f "$RVM_LOCAL" ]; then
+         msg "Activating local RVM ..."
+         RVM_SOURCE="$RVM_LOCAL"
+      else
+         msg "Activating system RVM ..."
+         RVM_SOURCE="$RVM_SYSTEM"
+      fi
+
+      source "$RVM_SOURCE"
+      rvm $GEMFILE_VERSION
+   fi
+}
+
 # force the production enviroment
 export RAILS_ENV=production
 
@@ -249,8 +299,10 @@ safe_copy "${config_id}"
 
 # here is where things happens on the server
 install_new_files "${config_id}"
+activate_gems
 fix_gems
 createdb
+channels
 migrate
 assets
 permissions

data/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/gem-public_cert.pem

@@ -1,22 +1,26 @@
 -----BEGIN CERTIFICATE-----
-MIIDjjCCAnagAwIBAgIBATANBgkqhkiG9w0BAQUFADBGMRgwFgYDVQQDDA9ldXN0
-YXF1aW9yYW5nZWwxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixk
-ARkWA2NvbTAeFw0xNzA2MDMyMjM3MjdaFw0xODA2MDMyMjM3MjdaMEYxGDAWBgNV
-BAMMD2V1c3RhcXVpb3JhbmdlbDEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYK
-CZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-pI58OaGELZWRnqvArECgbbOOU5ThDxGRoBz/91KaXysVAalPUVtEXQjsZSc6wOKb
-a+m2vEZ6j1LWMfG1xKh07KN/EwcmUoG9uj/U+OcZ+M6YA+DSDBQJozXEUgKiD0e0
-crZqrq+Qo9jg19lPvYcsFS4WumC3gtrx8Fe8K5JTEFR71Md3nnuBuKp1pouYTC3b
-UQ2Xv1URDITKa3N3Kyu/6MJOYBJ2nvDKdEdMFbXxKiC/Njv7eIF+1iNWrzp8osgL
-5LWITluL2n+/14QVDJehLRuh9Zg9WGT6FEji4PsmNQtZKwYpGGzNX5dDeYZcbhPk
-ri9MK8ztMYBLkNzd4sbbPQIDAQABo4GGMIGDMAkGA1UdEwQCMAAwCwYDVR0PBAQD
-AgSwMB0GA1UdDgQWBBR9bkdMJUe5Lyc1V8NQm1hbjPpKBzAkBgNVHREEHTAbgRll
-dXN0YXF1aW9yYW5nZWxAZ21haWwuY29tMCQGA1UdEgQdMBuBGWV1c3RhcXVpb3Jh
-bmdlbEBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQADggEBAF8KZx0njczbBRXzjGo0
-mTsAOlB474ZqQjKN1zL/sGw8G4Q/UpeVEclBZrP9P9PUomYliGP38oYM4DHHMpyd
-Qh9Wsou0ZJ5oD0O3nRraOVGFN7Azm05+xJ4fV1Zi8nsUdpF3za7s27Non9cYF4/2
-iwJPWOjl/AxvAS2efkECSGbuZtuNKWrWYMH+aGbtavd5hfb8voGbTFYB4azbQQf+
-ESf+WEicRlMQuQUn314wSFq1pq65S9GrZWMmSP5gc0kKfa51fOmIYmO3eSlmWG/p
-G+/hO8DFcpmRPCD/YXu/rFkKHquizBGSfr1BR/es/HhfrIoT3BUN2uDUT02aaWmB
-JMg=
+MIIEVjCCAr6gAwIBAgIBATANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDDB9ldXN0
+YXF1aW9yYW5nZWwvREM9Z21haWwvREM9Y29tMB4XDTIxMDEwNTE1MTMzNFoXDTIy
+MDEwNTE1MTMzNFowKjEoMCYGA1UEAwwfZXVzdGFxdWlvcmFuZ2VsL0RDPWdtYWls
+L0RDPWNvbTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKBL7R3l8n3I
+RXuw3CvEa/fDbd1//jFhfXwow41Mo4fQMuccm9fYs/kTZ4+06zv0ALlQtu5tsD6A
+An9uR3d91VKN+M5mSK3lQF4FgsWqyU3kJ7qqWhWjylTyYBqku5RJINdFU6lkk/9Y
+jxaCkOETfmzKUbfLV0+qrOvDsOzyoOv7HGJORjIy4NWfxu8mwDbhogyq4h81MCLC
+EIvp5LdfpbgahPsPdqvQO868oUmxN+U+ZTXfRwrcyrC8bjaURS0jPW8PWQCjsfO9
+L/viUwHlHUDVY/iT2kvSuZrCdhRVPt9QikdLGbze+YkdNkOXfR6EQjxRmg4OQjs9
+DvMbS6D2Zd6VK6PXFLqDA6BrLFqK6Zvr87xVmxDIZ/WN63PjgNCMEFb5ZKzy2hix
+N5f2pQDcdoR1m5psHoKe4nCPc/vFnYsTbfcbcF5+vV7+EgmTmSWyhei09eytrz/5
+FLn0Pizaffk1DFHg68fl/b6QrsfmRRJCr4hrwGlUl+6eDUdxUktW2wIDAQABo4GG
+MIGDMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQeQRJ+Zb0whKTS
+5l+2kfAZROALwzAkBgNVHREEHTAbgRlldXN0YXF1aW9yYW5nZWxAZ21haWwuY29t
+MCQGA1UdEgQdMBuBGWV1c3RhcXVpb3JhbmdlbEBnbWFpbC5jb20wDQYJKoZIhvcN
+AQELBQADggGBAF60gRzDOWc7B6g4jQzR2Bi90pVSfUXRCkODqCaosSET18pXu63G
+mXh4ACRSKMM3X6Cj2uDQEhrvWnxt0R5P1TD6G3uOXGzMAmihPVyCJyUCFwuxAt9V
+GLCyn2Ti9MIT0FyujhEXSQdJjAyuDGtEkO2LIKBJ+CIbG68FBqc1k+UwPQiNJCgE
+s3Fsha0Wv75uupzqu57FHXHSjdnBNeQHfdC+Ma8VIlWdKxfcxZKOEL589tnJTJHF
+IRNTTxZFwTTvZy2aSvBb73m+clb36mlGO3emb/S3WMu2oOlmorHD4CAbyZjPTwIs
+zYVH+Nlf2O8Li2j3QNGL0r2MNCJWeuhB23IOoL60AaxvpyHAbWnfOpqidQU1Zwpg
+cXxQcroczXGs/RH1diJes5AihU97po1EVyVpxjkyiVZxd0fl+r3OR7iYSSNMrdpH
+Ey5t62RSM7fM69lDtUa1Jmv/CCRAeeY4TQUFwDrnNYhxQshCWcrFWQMb4ExJtwbC
+iQ4FrdvzJJS+rA==
 -----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