oye 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db235ec5368219133e4a2c3b13de51ca4fc021a584ba625828c1584da3b8c2c1
-  data.tar.gz: f0336786603d0f76352ed08230b514da02ab816fc0da825f4f5c5e308f9a8e04
+  metadata.gz: 4d831e91e5865351713d5cb2afcc47999d17295f38ff912be8a68cc4fa096702
+  data.tar.gz: bbee3ceed27964133da5521bcc60c03c1632ae734ae70d384b4badc6afaa0fee
 SHA512:
-  metadata.gz: e7c8c761835d0cd0398cb6c629be42843ea7266f8b641f9ecb4bbaa0de12d35bda0fa4e39bce0cdf451d694ed31981a0a16fc7d0c4e1005ed03cd934756b1750
-  data.tar.gz: 8883d0b11278ea7e5b8f898e887d910554b4da4c3fa46c8ee7506e64454c801cc00be98545cb4db757d43173cb48bf3a656eb30dd9a7b2dedf08515458a86aa5
+  metadata.gz: a13bed4b5ba684e80a118cc96ae80840965844a1878fcf2400b5e675c883b6ba78d889e46838f4413b36aea5c5c81c811126a51e03adf33097e2e36b002dc98c
+  data.tar.gz: 54240a68d4cfabd48066b7b7a9c9e88ff1cca967150197068e22346fe83551ec3d38eba390b4d4d294e929c80a6f095cbc9e96370b1568323f9333ac94c0ce90

data/Gemfile.lock

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

data/README.md

@@ -16,3 +16,4 @@ A continuous monitoring tool that does a few things:
 [ ] 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
+[ ] split the file. use Oye::Actions as a namespace for update, restart, start, stop methods

data/lib/oye.rb

@@ -17,9 +17,9 @@ 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'))
+      stop_oye if(args.include?('-s') or args.include?('--stop'))
+      restart_oye if(args.include?('-r') or args.include?('--restart'))
+      config_oye if(args.include?('-c') or args.include?('--config'))
 
       FileUtils.mkdir_p(oyedir)
 
@@ -66,9 +66,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,24 +95,24 @@ module Oye
       exit
     end
 
+    # main method
     def monitor
       %w(TERM INT).each do |signal|
         trap(signal) do
           stop_oye
-          FileUtils.rm_f(oye_pidfile)
-          log(oye_pidfile, status: :info, message: "Stopped oye")
           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
+          # initial build and start of apps
           @repos.values.flatten.each do |app|
             app['clones'].each do |clone|
               if !File.exists?(clone)
@@ -122,10 +122,11 @@ module Oye
 
               build_app(clone)
 
-              serve_app(clone)
+              start_app(clone)
             end
           end
 
+          # loop that watches for changes in origin repos
           loop do
             repos_dup = @repos
             repos_dup.keys.each do |origin|
@@ -142,18 +143,15 @@ module Oye
 
                 unless @repos[origin]['stat'] == File.stat(origin).ctime
                   @repos[origin]['stat'] = File.stat(origin).ctime
-                  stop_app(clone) if File.exists?(app_pid_file(clone))
                   update_app(clone)
                   build_app(clone)
-                  serve_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 }
@@ -194,20 +192,38 @@ module Oye
       log(dir, status: :warn, message: "#{__method__.to_s} (#{e.message})")
     end
 
-    def serve_app(dir)
+    def stop_app(dir)
       if rails_app?(dir)
-        unicorn_options = @unicorn_default_options << " -c #{unicorn_file(dir)}"
-
-        %x{unicorn_rails #{unicorn_options}}
-
-        log(dir, status: :info, message: "Started app")
+        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_app(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_app(dir)
@@ -226,13 +242,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|
@@ -270,15 +288,24 @@ 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
 
-    # rails_app?, jekyll_app?
+    # 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/)
@@ -293,6 +320,7 @@ module Oye
       File.join(dir, "Gemfile.lock")
     end
 
+    # return +true+ if the port is open else +false+
     def port_open?(port)
       begin
         Timeout::timeout(1) do
@@ -318,10 +346,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
@@ -330,7 +360,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.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oye
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - sergioro