oye 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba0137a6da4e4541a1691339760c047d60c4b223aafbdccc7195ceb85ebef815
-  data.tar.gz: b489de80c32505ff4009e30924ba1e1ba45698b456371a57dc6c917600e7e7ff
+  metadata.gz: bd9695ade1c74d7e4a4c0593cd39f0e559f94a3242586e905d33eb66dbc30f49
+  data.tar.gz: ca15ae1503c2fe6777c0a3f9dfc1a7be7a8975407931c8d192930a0524812ef3
 SHA512:
-  metadata.gz: bdf339dfbbae4ab3e961002c952532ce6aad899ce6f1d453ecf23afbaaa94aed67430cc2fcfca7845a2dba608df6b66e59d95530bf15d6fc0b00c894f707ef52
-  data.tar.gz: e22782ff4bfcf7f59ea864c52ac72e5469c265e90a0fe4fb21d2fee86b4cb3f85d6c3fef5ed9e44c1a726f6ee0944340d444a39f0495d1b1d128da640b093fb4
+  metadata.gz: e59fb07e4d00d6551cbec9edd4524da762bedb0641cc27e546d11f809d7424b6b995180d66ee0f4b425a646806e381a8699a112c8136977bf23c9967c03d39a5
+  data.tar.gz: '009310c48f9299dc31750fcb4fbc5316a1b2f52e3a1ae48973e2eab950ce563ddf6cc065c7896a4dc355ec6a2bdcd65bef73d4e52d74eabf4bf17a03a8d9c810'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oye (0.1.1)
+    oye (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -7,3 +7,5 @@ A continuous monitoring tool that does a few things:
     3. restarts the rails app with the new code
 
 [ ] use multithreaading. each thread should watch a unique repo.
+[ ] run rails tests inside Oye.monitor
+[ ] check for irregularities in @repos, e.g two repeated cloned repos

data/lib/oye.rb

@@ -2,11 +2,16 @@ $LOAD_PATH.unshift __dir__
 
 require "oye/version"
 require 'fileutils'
+require 'yaml'
 
 module Oye
   class Error < StandardError; end
 
-  @interval = 5
+  DEFAULT_WATCH_INTERVAL = 5
+  DEFAULT_PORT = 3000
+  DEFAULT_ENVIRONMENTS = %w(development production test)
+  LOG_FORMAT = "[%Y-%m-%d %H:%M:%S]"
+
 
   class << self
     def start(args)
@@ -18,97 +23,136 @@ module Oye
 
       FileUtils.mkdir_p(oyedir)
 
+      @repos = {}
       read_config
 
       list if(args.include?('-l') or args.include?('--list'))
 
       if(args.include?('-i') or args.include?('--info'))
         args.map! {|a| a == '--info' ? '-i' : a}
-        _, @pattern = args.slice!(args.index('-i'),2)
+        _, @pattern = args.slice(args.index('-i'),2)
         @pattern = @pattern.nil? ? /.*/ : Regexp.new(@pattern)
         info
       end
 
+      @interval = DEFAULT_WATCH_INTERVAL
       if(args.include?('-t') or args.include?('--time'))
         args.map! {|a| a == '--time' ? '-t' : a}
-        _, @interval = args.slice!(args.index('-i'),2)
+        _, @interval = args.slice(args.index('-t'),2)
         @interval = @interval.to_i
+        unless @interval > 0
+          puts "Interval must a positive integer"
+          exit
+        end
+      end
+
+      @port = DEFAULT_PORT
+      if(args.include?('-p') or args.include?('--port'))
+        args.map! {|a| a == '--port' ? '-p' : a}
+        _, @port = args.slice(args.index('-p'),2)
+        @port = @port.to_i
+        unless @port > 0
+          puts "Port must a positive integer"
+          exit
+        end
+      end
+
+      @environment = 'production'
+      if(args.include?('-e') or args.include?('--environment'))
+        args.map! {|a| a == '--environment' ? '-e' : a}
+        _, @environment = args.slice(args.index('-e'),2)
+        unless DEFAULT_ENVIRONMENTS.include?(@environment)
+          puts "Specify a supported environment for -e option"
+          exit
+        end
       end
 
       monitor
     end
 
     def read_config
-      @repos = {}
-
-      YAML.load(File.open(oye_config)).each do |origin, clone|
-        @repos[origin] = {'clone' => clone}
+      YAML.load(File.open(oye_config)).each do |origin, clones|
+        @repos[origin] = {'clones' => clones}
       end
     end
 
     def help
       puts <<~eos
-      -c, --config            print config and log files
+      -c, --config            print config, log and pid files
+      -e, --environment ENV   environment for the app server [development|production|test] (default production)
       -h, --help              print this message
       -i, --info [PATTERN]    print info of repos matching PATTERN (default .*)
       -l, --list              print monitored repos
+      -p, --port PORT         port for app server (default 3000)
       -r, --restart           restart oye
       -s, --stop              stop oye
-      -t, --time [SECS]       time interval for repo monitoring (default 5)
+      -t, --time SECS         time interval for repo monitoring (default 5)
       -v, --version           print oye version
       eos
       exit
     end
 
-    def restart_clone
-      system("cd #{File.dirname(@repos[repo]['clone']}")
-      system("git pull")
-      system("kill $(cat pids/*)")
-      system("unicorn_rails -l 178.128.15.65:3001 -c config/unicorn.rb -E production -D")
-    end
-
     def monitor
       trap('TERM') { exit }
       trap('INT') { exit }
 
-      not_found = []
-      repos_dup = @repos
-
-      repos_dup.keys.filter_map do |repo|
-        unless File.exists?(repo)
-          not_found << @repos.delete(repo)
-          next
-        end
-
-        @repos[repo]['stat'] = File.stat(repo).ctime
-      end
+      @repos.keys.filter_map do |origin|
+        next unless File.exists?(origin)
 
-      unless not_found.empty?
-        puts "\nWARNING Could not find repos:", not_found
+        @repos[origin]['stat'] = File.stat(origin).ctime
       end
 
-      log_format = "[%Y-%m-%d %H:%M:%S]"
-
       pid = fork do
         begin
+          # initialize apps if they are not running
+          # TODO i dont like this loop
+          @repos.values.flatten.each do |app|
+            app['clones'].each do |clone|
+
+              if !File.exists?(clone)
+                log(clone, status: :warn, message: "Could not find repo")
+                next
+              elsif !File.exists?(app_pid_dir(clone))
+                log(clone, status: :warn, message: "Could not find pids directory")
+                next
+              elsif File.exists?(app_pid_file(clone))
+                # if pid fle exists, the app should be running and there's no need to be initialize it
+                next
+              end
+
+              initialize_clone(clone)
+
+            rescue Errno::ESRCH
+            end
+          end
+
           loop do
             repos_dup = @repos
-            repos_dup.each do |repo|
-              unless @repos[repo]['stat'] == File.stat(name).ctime
-                @repos[repo]['stats'] = File.stat(name).ctime
+            repos_dup.keys.each do |origin|
+              unless File.exists?(origin)
+                log(origin, {status: :warn, message: "Could not find repo"})
+                next
+              end
 
-                File.open(oye_logfile, 'a') do |f|
-                  f.puts "#{@repos[repo]['stats'].strftime(log_format)} #{repo}"
+              repos_dup[origin]['clones'].each do |clone|
+                unless File.exists?(clone)
+                  log(clone, {status: :warn, message: "Could not find repo"})
+                  next
                 end
 
-                restart_clone
+                unless @repos[origin]['stat'] == File.stat(origin).ctime
+                  @repos[origin]['stat'] = File.stat(origin).ctime
+                  stop_clone(clone) if File.exists?(app_pid_file(clone))
+                  update_clone(clone)
+                  initialize_clone(clone)
+                end
               end
             end
             sleep @interval
           end
-        rescue => e
-          abort "There was a fatal system error while starting oye: #{e.message}, #{caller}"
         end
+      rescue => e
+        abort "Fatal system error while initializing oye: #{e.message}, #{caller}"
       end
 
       File.open(oye_pidfile, 'w') { |f| f.puts pid }
@@ -116,14 +160,59 @@ module Oye
       ::Process.detach pid
     end
 
+    def log(repo, options = {})
+      log_message = [
+                      Time.now.strftime(LOG_FORMAT),
+                      repo,
+                      "[#{options[:status].to_s.upcase}]",
+                      "\"#{options[:message]}\""
+                    ].join(' ')
+
+      File.open(oye_logfile, 'a') do |f|
+        f.puts log_message
+      end
+    end
+
+    def initialize_clone(dir)
+      Dir.chdir(dir) do
+        %x(bundle)
+
+        %x(RAILS_ENV=#{@environment} rails db:migrate)
+
+        if @environment == 'production'
+          %x(RAILS_ENV=production rails assets:{clean,precompile})
+        end
+      end
+
+      %x{unicorn_rails -l :#{@port} -c #{unicorn_file(dir)} -E #{@environment} -D}
+    rescue => e
+      log(dir, status: :warn, message: "#{__method__.to_s} (#{e.message})")
+    end
+
+    def stop_clone(dir)
+      Process.kill 'TERM', app_pid(dir)
+    end
+
+    def update_clone(dir)
+      system("git -C #{dir} pull", [:out, :err] => File::NULL)
+
+      log(dir, status: :info, message: "Pulled from origin")
+    rescue => e
+      log(dir, status: :warn, message: "#{__method__.to_s} (#{e.message})")
+    end
+
     def list
-      puts @repos.keys
+      @repos.each do |origin, clones|
+        puts origin
+        clones.values.flatten.map {|clone| puts clone.prepend "  - "}
+      end
       exit
     end
 
     def config
       puts "Config file: #{oye_config}"
       puts "Log file: #{oye_logfile}"
+      puts "PID file: #{oye_pidfile}"
       exit
     end
 
@@ -162,12 +251,18 @@ module Oye
       exit
     end
 
+    # TODO ensure that pid corresponds to 'oye' process. maybe check
+    # command name like 'ps(1)'
     def stop
+      Process.kill oye_pid
     end
 
+    # TODO implement
     def restart
     end
 
+    private
+
     def oyedir
       "#{ENV['HOME']}/.oye"
     end
@@ -184,5 +279,26 @@ module Oye
     def oye_pidfile
       "#{oyedir}/oye.pid"
     end
+
+    def oye_pid
+      File.read(oye_pidfile).to_i
+    end
+
+
+    def unicorn_file(dir)
+      File.join(dir, "config/unicorn.rb")
+    end
+
+    def app_pid(dir)
+      File.read(app_pid_file(dir)).to_i
+    end
+
+    def app_pid_file(dir)
+      File.join(app_pid_dir(dir), "unicorn.pid")
+    end
+
+    def app_pid_dir(dir)
+      File.join(dir, "pids")
+    end
   end
 end

data/lib/oye/version.rb

@@ -1,3 +1,3 @@
 module Oye
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oye
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - sergioro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips