traquitana 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02aba41ee56fff3715bc9b3a5f14f17939c9ad771c28841aab1ea6a81e5c5c6b
-  data.tar.gz: 240fbc2ff2b332a037a81bb3b4b49e4d21f4680bba41131fc99e189cbb35e7df
+  metadata.gz: 8796c0d24b549a6b7f848ffc2bc374a23590d312c0d49b83d9587b956e905e08
+  data.tar.gz: f23850ebdac4fac4e173132d1d55ff293178fca42b49a0744cb59cfb6c40672b
 SHA512:
-  metadata.gz: a6056e8b0317117224029b52d1b3da160665dc06844a64bd4258b6993198d348914b1697692a437c5fa7de08bb05e53f7f200d32c6d9f6323fb0f66e39d15ad2
-  data.tar.gz: 8777dbf451d8323bd78f36935c8f4ca3543e3ceb2dc193a4afd3df022e115fde4ffe9a682db3fb698e7941dc12ad1d76a6db966ac1cf9d6f577bd2fac20280ae
+  metadata.gz: 6aa9a2e32d9435b2806a5a624c8477a3e6533c9239d41672585eab142227ea85f35d2adde1f4a765757be4bcd50c4198d0b682f91cc97ff24e7623bb7d7fcd28
+  data.tar.gz: f753cee4d955b30333e8d575666366a3bee2421c559cf1b6f5e2fe3fa28e54c3aa92dae7cf0543f962eb7fbf1ed1978b1225914ec3643da2c34c68cd7aab3ea5

data/Gemfile.lock

@@ -1,7 +1,9 @@
 PATH
   remote: .
   specs:
-    traquitana (0.1.7)
+    traquitana (2.0.6)
+      bcrypt_pbkdf
+      ed25519
       highline
       net-scp
       net-ssh
@@ -10,10 +12,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    highline (2.0.3)
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-ssh (6.1.0)
+    bcrypt_pbkdf (1.1.1)
+    ed25519 (1.3.0)
+    highline (3.1.1)
+      reline
+    io-console (0.7.2)
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-ssh (7.3.0)
+    reline (0.5.10)
+      io-console (~> 0.5)
     rubyzip (2.3.2)
 
 PLATFORMS

data/README.md

@@ -44,6 +44,9 @@ $ gem install traquitana
 	- ignore: it will just send the files that had changed on less than the number of hours configured here
 	- server: the webserver running on the server. ex: passenger
 	- list: the list of file patterns searched to send to the server
+    - branches: optional, will check if your Git current branch is allowed on
+      the branches listed here (comma separated), preventing from deploying from
+      a wrong branch
 
 	On the list can have two elements by row, like:
 
@@ -70,12 +73,12 @@ $ gem install traquitana
 	- Will create a list with the file names found
 	- Will zíp the files.
 	- Will send the list to the server, together with some control files.
-   - What the control files are for: they are shell scripts that will zip the
-     old files (based on what new files are going), unzip the new files, run
-     migrations if needed, run bundle install if the Gemfile contents changed
-     and restart the web server. There are two files: one generic to make all
-     sort of things BUT not restarting the web server. The webserver script will
-     be send based on what webserver you need.
+    - What the control files are for: they are shell scripts that will zip the
+      old files (based on what new files are going), unzip the new files, run
+      migrations if needed, run bundle install if the Gemfile contents changed
+      and restart the web server. There are two files: one generic to make all
+      sort of things BUT not restarting the web server. The webserver script will
+      be send based on what webserver you need.
 
 - Now everything should be updated. On the next time you want to update your
   project, just run traq again.
@@ -86,7 +89,7 @@ $ gem install traquitana
 Use for your risk. I think it's all ok but I don't give you guarantee if it
 break something.
 
-## Options
+## CLI options
 
 There are some command line options:
 

data/lib/deployer.rb

@@ -11,7 +11,7 @@ module Traquitana
       STDOUT.puts "\e[1mRunning Traquitana version #{VERSION}\e[0m\n\n"
 
       unless File.exist?(@config.filename)
-        warn "\e[31mNo config file (#{@config.filename}) found."
+        warn "\e[31mNo config file (#{@config.filename}) found.\e[0m"
         warn "Did you run \e[1mtraq setup\e[0;31m ?"
         warn "Run it and check the configuration before deploying.\e[0m"
         exit 1
@@ -19,6 +19,8 @@ module Traquitana
 
       @config.load
 
+      check_branches
+
       @options = @config.password.size > 1    ? { password: @config.password } : {}
       @server  = @config.server.to_s.size > 0 ? @config.server : "none"
       @shell   = @config.shell                ? "#{@config.shell} " : ""
@@ -66,5 +68,17 @@ module Traquitana
 
       @config.filename
     end
+
+    def check_branches
+      return if @config.branches.to_s.size < 1
+
+      current_branch = Git.current_branch
+      STDOUT.puts "Checking if current branch \e[1m#{current_branch}\e[0m is allowed in #{@config.branches}\n"
+
+      return if @config.branches.split(',').map(&:strip).include?(current_branch)
+
+      warn "Branch \e[31m#{current_branch}\e[0m not allowed to deploy!\n\n"
+      exit 1
+    end
   end
 end

data/lib/git.rb

@@ -0,0 +1,11 @@
+module Traquitana
+  class Git
+    def self.current_branch
+      IO.popen('git rev-parse --abbrev-ref HEAD') do |io|
+        io.read.chomp
+      end
+    rescue
+      nil
+    end
+  end
+end

data/lib/traquitana/version.rb

@@ -1,3 +1,3 @@
 module Traquitana
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 end

data/lib/traquitana.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traquitana
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Eustaquio Rangel
@@ -36,7 +36,7 @@ cert_chain:
   NO+xAJE0adRapfa4LBdJ6bGWqGA7u39vdJcIAbyTbO17MMWXItJuD3zDdng/9JWP
   XJH9EG4shjCU
   -----END CERTIFICATE-----
-date: 2024-06-21 00:00:00.000000000 Z
+date: 2024-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -150,6 +150,7 @@ files:
 - lib/cleaner.rb
 - lib/config.rb
 - lib/deployer.rb
+- lib/git.rb
 - lib/packager.rb
 - lib/selector.rb
 - lib/ssh.rb
@@ -219,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Just a simple tool to deploy Rails apps with SSH and some shell scripts