thundercat 0.0.8 → 0.0.9

data/README.md

@@ -55,6 +55,18 @@ This deploys a rap archive to a thundercat server e.g.
 -r is to specify your rap archive and -u is the url of the deploy api where your thundercat instance is running. -k is your api_key which is configured in your
 thundercat server.
 
+## Upgrading
+
+There is a very crude upgrade script starting from thundercat-0.0.8 - This is the process:
+
+   * stop your exising monitor using ./stop.sh
+   * copy your webapps/thundercat/config.yml somewhere safe
+   * thundercat-upgrade your_thundercat_install_folder
+   * start the monitor again using ./start.sh
+   * replace webapps/thundercat/config.yml with your original one
+   * restart monitor - ./stop.sh && ./start.sh
+   * check everything is ok
+
 ## Screenshots
 
 ### Admin Page

data/bin/thundercat

@@ -12,6 +12,9 @@ else
     monitor = File.dirname(File.expand_path(__FILE__)) + '/../src/monitor/monitor.rb'
     start_script = File.dirname(File.expand_path(__FILE__)) + '/../src/monitor/start.sh'
     stop_script = File.dirname(File.expand_path(__FILE__)) + '/../src/monitor/stop.sh'
+    standalone = File.dirname(File.expand_path(__FILE__)) + '/../src/monitor/standalone.rb'
+    standalone_start_script = File.dirname(File.expand_path(__FILE__)) + '/../src/monitor/start_standalone.sh'
+    standalone_stop_script = File.dirname(File.expand_path(__FILE__)) + '/../src/monitor/stop_standalone.sh'
 
     target_dir = "#{name}"
     if File.exists?(target_dir)
@@ -27,6 +30,9 @@ else
       FileUtils.cp(monitor, target_dir)
       FileUtils.cp(start_script, target_dir)
       FileUtils.cp(stop_script, target_dir)
+      FileUtils.cp(standalone, target_dir)
+      FileUtils.cp(standalone_start_script, target_dir)
+      FileUtils.cp(standalone_stop_script, target_dir)
       puts "[ThunderCat] Successfully created ThunderCat structure at: #{target_dir}"
     end
   rescue => e

data/bin/thundercat-upgrade

@@ -29,6 +29,27 @@ else
       FileUtils.cp(rap, "#{target_dir}/webapps")
     end
 
+    if existing_version > "0.0.256" and existing_version < "0.0.261"
+      # create standalone new files
+      rap = File.dirname(File.expand_path(__FILE__)) + '/../src/rap/thundercat.rap'
+      monitor = File.dirname(File.expand_path(__FILE__)) + '/../src/monitor/monitor.rb'
+      standalone = File.dirname(File.expand_path(__FILE__)) + '/../src/monitor/standalone.rb'
+      standalone_start_script = File.dirname(File.expand_path(__FILE__)) + '/../src/monitor/start_standalone.sh'
+      standalone_stop_script = File.dirname(File.expand_path(__FILE__)) + '/../src/monitor/stop_standalone.sh'
+
+      # remove old monitor and replace with new monitor
+      FileUtils.rm_rf("#{target_dir}/monitor.rb") if File.exists?("#{target_dir}/monitor.rb")
+      FileUtils.cp(monitor, target_dir)
+
+      # copy in new standalone scripts
+      FileUtils.cp(standalone, target_dir)
+      FileUtils.cp(standalone_start_script, target_dir)
+      FileUtils.cp(standalone_stop_script, target_dir)
+
+      # drop in new thundercat rap
+      FileUtils.cp(rap, "#{target_dir}/webapps")
+    end
+
     puts "[ThunderCat] Successfully updated ThunderCat at: #{target_dir}"
 
   rescue => e

data/src/monitor/monitor.rb

@@ -24,23 +24,6 @@ class Decision
     `cd #{webapps_dir}/thundercat; ./start.sh`
   end
 
-  def standalone_decide(option, base, relative, type)
-    zip_file = base + '/' + relative
-    zip_dir = path_without_ext(zip_file, base)
-    if option == :create
-      clean_standalone(zip_dir, zip_file, base) if rap_already_deployed?(zip_dir)
-      deploy_standalone(zip_file, zip_dir, base)
-    end
-  end
-
-  def standalone_initial(standalone_dir)
-    Dir.entries(standalone_dir).each do |entry|
-      if entry.match(/.zip$/)
-        decide(:create, standalone_dir, entry, 'file')
-      end
-    end
-  end
-
   private
 
   def deploy_rap(rap_file, rap_dir, base)
@@ -69,12 +52,6 @@ class Decision
 
   end
 
-  def deploy_standalone(zip_file, zip_dir, base)
-    Rappa.new(:input_archive => zip_file, :output_archive => base).standalone_expand
-    puts "[ThunderCat] Successfully deployed standalone zip archive at: #{zip_file}"
-    archive_zip(zip_file, base)
-  end
-
   def stop_app(rap_dir)
     rap_file = rap_dir + '/rap.yml'
     if File.exists?(rap_file)
@@ -91,20 +68,11 @@ class Decision
     FileUtils.mv(rap_dir, "#{base}/../archive/#{file_without_ext(rap_file)}.#{Time.now.to_i}")
   end
 
-  def archive_existing_standalone(zip_dir, zip_file, base)
-    FileUtils.mv(zip_dir, "#{base}/../standalone_archive/#{file_without_ext(zip_file)}.#{Time.now.to_i}")
-  end
-
   def archive_rap(rap_file, base)
     FileUtils.mv(rap_file, "#{base}/../archive/#{file_without_ext(rap_file)}.#{Time.now.to_i}.rap")
     puts "[ThunderCat] archived rap file: #{rap_file}"
   end
 
-  def archive_zip(zip_file, base)
-    FileUtils.mv(zip_file, "#{base}/../standalone_archive/#{file_without_ext(zip_file)}.#{Time.now.to_i}.zip")
-    puts "[ThunderCat] archived standalone zip file: #{zip_file}"
-  end
-
   def rap_already_deployed?(rap_dir)
     File.exists?(rap_dir)
   end
@@ -114,10 +82,6 @@ class Decision
     archive_existing_app(rap_dir, rap_file, base)
   end
 
-  def clean_standalone(zip_dir, zip_file, base)
-    archive_existing_standalone(zip_dir, zip_file, base)
-  end
-
   def path_without_ext(file, base)
     base_name = File.basename(file)
     base + '/' + base_name.chomp(File.extname(base_name))
@@ -136,20 +100,11 @@ class Monitor
   def self.go
     begin
       webapps_dir = File.dirname(__FILE__) + '/webapps'
-      standalone_dir = File.dirname(__FILE__) + '/standalone'
       Decision.new.initial(webapps_dir)
-      Decision.new.standalone_initial(standalone_dir)
       FSSM.monitor(webapps_dir, '**/*.rap', :directories => true) do
         update { |base, relative, type| puts "updated #{base}, #{relative}, #{type}" }
         delete { |base, relative, type| puts "delete #{base}, #{relative}, #{type}" }
         create { |base, relative, type| Decision.new.decide(:create, base, relative, type) }
-
-        FSSM.monitor(standalone_dir, '**/*.zip', :directories => true) do
-        update { |dir, relative, type| puts "updated #{dir}, #{relative}, #{type}" }
-        delete { |dir, relative, type| puts "delete #{dir}, #{relative}, #{type}" }
-        create { |dir, relative, type| Decision.new.standalone_decide(:create, dir, relative, type) }
-      end
-
       end
 
     rescue => e

data/src/monitor/standalone.rb

@@ -0,0 +1,88 @@
+#!/usr/bin/env ruby
+require 'fssm'
+require 'dante'
+require 'yaml'
+require 'rappa'
+
+class Decision
+
+  def standalone_decide(option, base, relative, type)
+    zip_file = base + '/' + relative
+    zip_dir = path_without_ext(zip_file, base)
+    if option == :create
+      clean_standalone(zip_dir, zip_file, base) if zip_already_deployed?(zip_dir)
+      deploy_standalone(zip_file, zip_dir, base)
+    end
+  end
+
+  def standalone_initial(standalone_dir)
+    Dir.entries(standalone_dir).each do |entry|
+      if entry.match(/.zip$/)
+        decide(:create, standalone_dir, entry, 'file')
+      end
+    end
+  end
+
+  private
+
+  def deploy_standalone(zip_file, zip_dir, base)
+    Rappa.new(:input_archive => zip_file, :output_archive => base).standalone_expand
+    puts "[ThunderCat] Successfully deployed standalone zip archive at: #{zip_file}"
+    archive_zip(zip_file, base)
+  end
+
+  def archive_existing_standalone(zip_dir, zip_file, base)
+    FileUtils.mv(zip_dir, "#{base}/../standalone_archive/#{file_without_ext(zip_file)}.#{Time.now.to_i}")
+  end
+
+  def archive_zip(zip_file, base)
+    FileUtils.mv(zip_file, "#{base}/../standalone_archive/#{file_without_ext(zip_file)}.#{Time.now.to_i}.zip")
+    puts "[ThunderCat] archived standalone zip file: #{zip_file}"
+  end
+
+  def zip_already_deployed?(rap_dir)
+    File.exists?(rap_dir)
+  end
+
+  def clean_standalone(zip_dir, zip_file, base)
+    archive_existing_standalone(zip_dir, zip_file, base)
+  end
+
+  def path_without_ext(file, base)
+    base_name = File.basename(file)
+    base + '/' + base_name.chomp(File.extname(base_name))
+  end
+
+  def file_without_ext(file)
+    base_name = File.basename(file)
+    base_name.chomp(File.extname(base_name))
+  end
+
+end
+
+
+class Standalone
+
+  def self.go
+    begin
+      standalone_dir = File.dirname(__FILE__) + '/standalone'
+      Decision.new.standalone_initial(standalone_dir)
+      FSSM.monitor(standalone_dir, '**/*.zip', :directories => true) do
+        update { |base, relative, type| puts "updated #{base}, #{relative}, #{type}" }
+        delete { |base, relative, type| puts "delete #{base}, #{relative}, #{type}" }
+        create { |base, relative, type| Decision.new.standalone_decide(:create, base, relative, type) }
+      end
+
+    rescue => e
+      puts "[ThunderCat] Standalone encountered an error: #{e}"
+    end
+  end
+
+end
+
+Dante.run('standalone') do |opts|
+  Standalone.go
+end
+
+
+

data/src/monitor/start_standalone.sh

@@ -0,0 +1 @@
+./standalone.rb -P ./log/standalone.pid -d -l ./log/standalone.log

data/src/monitor/stop_standalone.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+
+begin
+
+pid = File.read(File.dirname(__FILE__) + '/log/standalone.pid').strip
+`kill -9 #{pid}`
+FileUtils.rm(File.dirname(__FILE__) + '/log/standalone.pid')
+puts "[ThunderCat] stopped thundercat standalone with process: #{pid}"
+
+rescue => e
+ puts "[ThunderCat] Oops something went wrong: #{e}"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thundercat
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -234,6 +234,9 @@ files:
 - src/monitor/monitor.rb
 - src/monitor/start.sh
 - src/monitor/stop.sh
+- src/monitor/standalone.rb
+- src/monitor/start_standalone.sh
+- src/monitor/stop_standalone.sh
 - README.md
 - bin/thundercat
 - bin/thundercat-upgrade