oye 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72649c178dd1644eb71bdb4f72f804ab8c4c190c6106736da15d876607adb285
-  data.tar.gz: 70c2d64e214075672aa155e2dff7629198bbb23fe30f51efcfabae643f67ab13
+  metadata.gz: a0f6ff207c4fac96695688a50e1b59a630d00d0da82f2b467d8e887a4a4f147c
+  data.tar.gz: '043181a7f859c284c01e8f37c9ca55f447e21a256e7e0b3f6c6d6bc1f4736e28'
 SHA512:
-  metadata.gz: d678648a0024307aa4695bbea4ae47ae82833637b8faabd8be2ec0ba67240ca4137b005619bdfdfdab7de8f67c70b572ea9e0a5dda14760bc90a8297af6cad6d
-  data.tar.gz: 47767c6ee7bb5fda3fe58aef52c015c971e611de65cf140623d48b8b19350b77adbb3f252d5a1d7abcbf6552352b05239aeb7cc83dda981540869a22c79c5f12
+  metadata.gz: 7bba790ca065eb5b4ea379a28490ac02e80a63e3998582c0037733a31ad3b0496ef073e695f66d5157e452448526a72da44be0ec5f9ff6def5e1d91a4fa6d7f0
+  data.tar.gz: 4a4914bd17c72fb35875230f3e651b4db0109b07a9a21a781660ec7769012577794170792d225e12d24cc142fe19d52d30705a40e3b6dd4e4621d6c65b4667c6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oye (0.1.7)
+    oye (0.1.12)
 
 GEM
   remote: https://rubygems.org/
@@ -41,4 +41,4 @@ DEPENDENCIES
   ruby-prof
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

data/README.md

@@ -10,4 +10,22 @@ A continuous monitoring tool that does a few things:
 [ ] run rails tests inside Oye.monitor
 [ ] check for irregularities in @repos, e.g two repeated cloned repos
 [ ] give warning if port is not open by using `port_open?` method
+  - fix possible port conflicts. for example `oye -p 3000` will add that port to the list of ports (or sockets) already specified in the app's config file (unicorn.rb). but you print an error if there are port conflicts
 [ ] why is the trap with `FileUtils.rm_f(oye_pidfile)` not removing the PID file
+[ ] make a website for 'oye' where you provide better documentation. e.g.
+  - how to set up oye.yml
+[ ] create a git brach called 'oye' and pull from that one instead of 'origin'.
+[ ] suport remote branches via 'ssh'. e.g. you can use `Net::SSH` as i use in '~/.ruby/req'
+[ ] support for webrick app server
+[ ] support for apps that dont use an app server (e.g. oye.dance and sergioro.mx run in nginx alone)
+[ ] support 'jekyll serve' for people that dont want to use a web server for jekyll
+[ ] split the file. use Oye::Actions as a namespace for update, restart, start, stop methods
+[ ] read environment for each app from oye.yml. e.g. user cn specify 'production' for one app and 'development' for another. The '-e' option is the default environment to be used if none is specified in oye.yml
+[ ] change %x() to system() to prevent undesired prints to console (e.g. if you stop 'oye' while it is running '%x(bundler)' it will dump bundler errors to the console.)
+[ ] give specific help for each command like jekyl does `jekyll [cmd] -h`
+  - e.g. with `oye port -h`
+[ ] there might be a hard-to-find-bug if `oye` is executing a `git pull` while the origin repo is receiving data from a `git push`.
+[ ] in 'oye.yml' you could pass an aditional parameter to specify what type of app it is. in this way you dont need to use `is_rails?`. e.g.
+    /git/pete.land.git:
+      - /var/www/html/pete.land:
+        type: jekyll

data/lib/oye.rb

@@ -2,9 +2,9 @@ $LOAD_PATH.unshift __dir__
 
 require "oye/version"
 require 'fileutils'
-require 'yaml'
 require 'socket'
 require 'timeout'
+require 'yaml'
 
 module Oye
   class Error < StandardError; end
@@ -17,9 +17,13 @@ module Oye
     def start(args)
       help if(args.include?('-h') or args.include?('--help'))
       version if(args.include?('-v') or args.include?('--version'))
-      stop if(args.include?('-s') or args.include?('--stop'))
-      restart if(args.include?('-r') or args.include?('--restart'))
-      config if(args.include?('-c') or args.include?('--config'))
+      restart_oye if(args.include?('-r') or args.include?('--restart'))
+      config_oye if(args.include?('-c') or args.include?('--config'))
+
+      if(args.include?('-s') or args.include?('--stop'))
+        stop_oye
+        exit
+      end
 
       FileUtils.mkdir_p(oyedir)
 
@@ -66,9 +70,9 @@ module Oye
         end
       end
 
-      @unicorn_default_options = "-E #{@environment} -D"
-
-      @unicorn_default_options << " -l #{@port}" if @port
+      @default_unicorn_options = "-E #{@environment} -D"
+      @default_unicorn_options << " -l #{@port}" if @port
+      @default_jekyll_options = "-B"
 
       monitor
     end
@@ -95,45 +99,38 @@ module Oye
       exit
     end
 
+    # main method
     def monitor
       %w(TERM INT).each do |signal|
         trap(signal) do
           stop_oye
-          FileUtils.rm_f(oye_pidfile)
           exit
         end
       end
 
+      # get change-times of origin repos
       @repos.keys.filter_map do |origin|
         next unless File.exists?(origin)
-
         @repos[origin]['stat'] = File.stat(origin).ctime
       end
 
       pid = fork do
         begin
-          # initialize apps if they are not running
-          # TODO i dont like this loop
+          # initial build and start of apps
           @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)
+              build_app(clone)
 
-            rescue Errno::ESRCH
+              start_app(clone)
             end
           end
 
+          # loop that watches for changes in origin repos
           loop do
             repos_dup = @repos
             repos_dup.keys.each do |origin|
@@ -150,17 +147,15 @@ module Oye
 
                 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)
+                  update_app(clone)
+                  build_app(clone)
+                  restart_app(clone)
                 end
               end
             end
             sleep @interval
           end
         end
-      rescue => e
-        abort "Fatal system error while initializing oye: #{e.message}, #{caller}"
       end
 
       File.open(oye_pidfile, 'w') { |f| f.puts pid }
@@ -181,31 +176,61 @@ module Oye
       end
     end
 
-    def initialize_clone(dir)
+    def build_app(dir)
       Dir.chdir(dir) do
         %x(bundle)
 
-        %x(RAILS_ENV=#{@environment} rails db:migrate)
+        if rails_app?(dir)
+          %x(RAILS_ENV=#{@environment} rails db:migrate)
 
-        if @environment == 'production'
-          %x(RAILS_ENV=production rails assets:{clean,precompile})
+          if @environment == 'production'
+            %x(RAILS_ENV=production rails assets:{clean,precompile})
+          end
+        elsif jekyll_app?(dir)
+          %x{jekyll build}
         end
       end
 
-      unicorn_options = @unicorn_default_options << " -c #{unicorn_file(dir)}"
-
-      %x{unicorn_rails #{unicorn_options}}
+      log(dir, status: :info, message: "Built app")
+    rescue => e
+      log(dir, status: :warn, message: "#{__method__.to_s} (#{e.message})")
+    end
 
-      log(dir, status: :info, message: "Started app server")
+    def stop_app(dir)
+      if rails_app?(dir)
+        if File.exists?(app_pid_file(dir))
+          Process.kill 'TERM', app_pid(dir)
+        end
+      elsif jekyll_app?(dir)
+        if @environment == 'development'
+          %x(pkill -f jekyll)
+        end
+      end
     rescue => e
       log(dir, status: :warn, message: "#{__method__.to_s} (#{e.message})")
     end
 
-    def stop_clone(dir)
-      Process.kill 'TERM', app_pid(dir)
+    def start_app(dir)
+      Dir.chdir(dir) do
+        if rails_app?(dir)
+          unicorn_options = @default_unicorn_options << " -c #{unicorn_file(dir)}"
+
+          system("unicorn_rails #{unicorn_options}", [:out, :err] => File::NULL)
+        elsif jekyll_app?(dir)
+          if @environment == 'development'
+            jekyll_options = @default_jekyll_options << " -s #{dir} -d #{dir}/_site"
+
+            system("jekyll serve #{jekyll_options}", [:out, :err] => File::NULL)
+          end
+        end
+      end
+
+      log(dir, status: :info, message: "Started app")
+    rescue => e
+      log(dir, status: :warn, message: "#{__method__.to_s} (#{e.message})")
     end
 
-    def update_clone(dir)
+    def update_app(dir)
       system("git -C #{dir} pull", [:out, :err] => File::NULL)
 
       log(dir, status: :info, message: "Pulled from origin")
@@ -221,13 +246,15 @@ module Oye
       exit
     end
 
-    def config
+    # print oye config files
+    def config_oye
       puts "Config file: #{oye_config}"
       puts "Log file: #{oye_logfile}"
       puts "PID file: #{oye_pidfile}"
       exit
     end
 
+    # print watched repos
     def info
       not_found = []
       @repos.keys.each do |repo|
@@ -265,14 +292,39 @@ module Oye
 
     def stop_oye
       Process.kill 'TERM', oye_pid
+      FileUtils.rm_f(oye_pidfile)
+      log(oye_pidfile, status: :info, message: "Stopped oye")
+    rescue Errno::ENOENT
     end
 
     # TODO implement
-    def restart
+    def restart_oye
+    end
+
+    def restart_app(clone)
+      stop_app(clone)
+      start_app(clone)
     end
 
     private
 
+    # determine type of application
+    # #rails_
+    %w(rails jekyll).each do |app_type|
+      define_method("#{app_type}_app?") do |dir|
+        if File.exist?(gemfile(dir)) && File.read(gemfile(dir)).match?(/^\s*#{app_type}\b/)
+          true
+        else
+          false
+        end
+      end
+    end
+
+    def gemfile(dir)
+      File.join(dir, "Gemfile.lock")
+    end
+
+    # return +true+ if the port is open else +false+
     def port_open?(port)
       begin
         Timeout::timeout(1) do
@@ -298,10 +350,12 @@ module Oye
       "#{oyedir}/oye.yml"
     end
 
+    # log +oye+ actions
     def oye_logfile
       "#{oyedir}/oye.log"
     end
 
+    # :stopdoc:
     def oye_pidfile
       "#{oyedir}/oye.pid"
     end
@@ -310,7 +364,6 @@ module Oye
       File.read(oye_pidfile).to_i
     end
 
-
     def unicorn_file(dir)
       File.join(dir, "config/unicorn.rb")
     end

data/lib/oye/version.rb

@@ -1,3 +1,3 @@
 module Oye
-  VERSION = "0.1.7"
+  VERSION = "0.1.12"
 end

data/oye.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Continuous monitoring tool}
   spec.description   = %q{Continuous monitoring tool}
+  spec.homepage      = "https://oye.dance"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
@@ -27,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "ronn", "~> 0.7"
   spec.add_development_dependency "ruby-prof", ">= 0"
 
-  #spec.add_runtime_dependency "SOME_GEM", "~> VERSION"
+  #spec.add_runtime_dependency "bundler", "~> 2.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oye
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.12
 platform: ruby
 authors:
 - sergioro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -129,7 +129,7 @@ files:
 - lib/oye.rb
 - lib/oye/version.rb
 - oye.gemspec
-homepage: 
+homepage: https://oye.dance
 licenses:
 - MIT
 metadata: {}