oye 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bf6d345d21055ee57c371e5edbb3e0d2ae58bb171188f73734eaaf2b3cdeefb
-  data.tar.gz: '07916a6ebf7239bda4fdf453ac9faf5b276108abd0a76a5fb2f14d32fe3f0057'
+  metadata.gz: db235ec5368219133e4a2c3b13de51ca4fc021a584ba625828c1584da3b8c2c1
+  data.tar.gz: f0336786603d0f76352ed08230b514da02ab816fc0da825f4f5c5e308f9a8e04
 SHA512:
-  metadata.gz: b5905be5887d49815da7d694d148007d79707ba9df85a8c0a16579e6bc31231ead94436654151311132ba09a9d45a15e32e00265178ca6cab3bc631c8b77ca8d
-  data.tar.gz: 6428d90426de619373b8ef4098ce650020db92235b1002f7f91dfb16eac7bfb5601d9c5d46f1595d85c5f14b35a1f1a3009c59f28d8d46fac8a5f4b44e5339f7
+  metadata.gz: e7c8c761835d0cd0398cb6c629be42843ea7266f8b641f9ecb4bbaa0de12d35bda0fa4e39bce0cdf451d694ed31981a0a16fc7d0c4e1005ed03cd934756b1750
+  data.tar.gz: 8883d0b11278ea7e5b8f898e887d910554b4da4c3fa46c8ee7506e64454c801cc00be98545cb4db757d43173cb48bf3a656eb30dd9a7b2dedf08515458a86aa5

data/Gemfile.lock

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

data/README.md

@@ -13,3 +13,6 @@ A continuous monitoring tool that does a few things:
 [ ] 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 'jekyll serve' for people that dont want to use a web server for jekyll

data/lib/oye/version.rb

@@ -1,3 +1,3 @@
 module Oye
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

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
@@ -100,6 +100,7 @@ module Oye
         trap(signal) do
           stop_oye
           FileUtils.rm_f(oye_pidfile)
+          log(oye_pidfile, status: :info, message: "Stopped oye")
           exit
         end
       end
@@ -112,25 +113,16 @@ module Oye
 
       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)
+              build_app(clone)
 
-            rescue Errno::ESRCH
+              serve_app(clone)
             end
           end
 
@@ -150,9 +142,10 @@ 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)
+                  stop_app(clone) if File.exists?(app_pid_file(clone))
+                  update_app(clone)
+                  build_app(clone)
+                  serve_app(clone)
                 end
               end
             end
@@ -181,31 +174,43 @@ 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)}"
+      log(dir, status: :info, message: "Built app")
+    rescue => e
+      log(dir, status: :warn, message: "#{__method__.to_s} (#{e.message})")
+    end
 
-      %x{unicorn_rails #{unicorn_options}}
+    def serve_app(dir)
+      if rails_app?(dir)
+        unicorn_options = @unicorn_default_options << " -c #{unicorn_file(dir)}"
 
-      log(dir, status: :info, message: "Started app server")
+        %x{unicorn_rails #{unicorn_options}}
+
+        log(dir, status: :info, message: "Started app")
+      end
     rescue => e
       log(dir, status: :warn, message: "#{__method__.to_s} (#{e.message})")
     end
 
-    def stop_clone(dir)
+    def stop_app(dir)
       Process.kill 'TERM', app_pid(dir)
     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")
@@ -273,6 +278,21 @@ module Oye
 
     private
 
+    # rails_app?, jekyll_app?
+    %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
+
     def port_open?(port)
       begin
         Timeout::timeout(1) do

data/oye.gemspec

@@ -28,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.8
+  version: 0.1.9
 platform: ruby
 authors:
 - sergioro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips