thundercat 0.0.6 → 0.0.7

data/README.md

@@ -4,6 +4,7 @@ ThunderCat is a ruby application container for Rack based applications. It is ve
 There is a web admin panel which lets you upload a .rap archive and also see which webapps are running and start/stop/remove them.
 
 [![Build Status](https://travis-ci.org/masterthought/thundercat.png?branch=master)](https://travis-ci.org/masterthought/thundercat)
+[![thundercat Downloads](http://www.gemetric.me/images/thundercat.gif)](https://rubygems.org/gems/thundercat)
 
 ## Background
 

data/bin/thundercat

@@ -21,6 +21,8 @@ else
       FileUtils.mkpath("#{target_dir}/webapps")
       FileUtils.mkpath("#{target_dir}/log")
       FileUtils.mkpath("#{target_dir}/archive")
+      FileUtils.mkpath("#{target_dir}/standalone")
+      FileUtils.mkpath("#{target_dir}/standalone_archive")
       FileUtils.cp(rap, "#{target_dir}/webapps")
       FileUtils.cp(monitor, target_dir)
       FileUtils.cp(start_script, target_dir)

data/bin/thundercat-upgrade

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+
+name = ARGV[0]
+
+if name.nil? or name.empty?
+  puts '[ThunderCat] Error you must supply a target directory containing an existing thundercat installation'
+else
+
+  begin
+    target_dir = "#{name}"
+
+    rap_file = File.open(target_dir + '/webapps/thundercat/rap.yml')
+    existing_version = YAML::load(rap_file)[:version]
+
+    if existing_version < "0.0.256"
+      # create standalone and standalone_archive directories
+      FileUtils.mkpath("#{target_dir}/standalone") unless File.exists?("#{target_dir}/standalone")
+      FileUtils.mkpath("#{target_dir}/standalone_archive") unless File.exists?("#{target_dir}/standalone_archive")
+      rap = File.dirname(File.expand_path(__FILE__)) + '/../src/rap/thundercat.rap'
+      monitor = File.dirname(File.expand_path(__FILE__)) + '/../src/monitor/monitor.rb'
+
+      # 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)
+
+      # drop in new thundercat rap
+      FileUtils.cp(rap, "#{target_dir}/webapps")
+    end
+
+    puts "[ThunderCat] Successfully updated ThunderCat at: #{target_dir}"
+
+  rescue => e
+    puts "[ThunderCat] OOps something went wrong: #{e}"
+  end
+end
+
+

data/src/monitor/monitor.rb

@@ -24,6 +24,23 @@ 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)
@@ -45,13 +62,19 @@ class Decision
       end
       `cd #{rap_dir} ; ./#{start_script}`
       puts "[ThunderCat] Successfully deployed and started app at: #{rap_file}"
-      archive_rap(rap_file,base)
+      archive_rap(rap_file, base)
     else
       puts '[ThunderCat] no rap file found so could not start app'
     end
 
   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)
@@ -68,11 +91,20 @@ class Decision
     FileUtils.mv(rap_dir, "#{base}/../archive/#{file_without_ext(rap_file)}.#{Time.now.to_i}")
   end
 
-  def archive_rap(rap_file,base)
+  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
@@ -82,6 +114,10 @@ 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))
@@ -100,12 +136,22 @@ 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}" }
+        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
       puts "[ThunderCat] Monitor encountered an error: #{e}"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thundercat
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -225,6 +225,7 @@ description: ! 'Easy way to deploy and monitor Rack applications as .rap archive
 email: kingsley@masterthought.net
 executables:
 - /thundercat
+- /thundercat-upgrade
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -235,6 +236,7 @@ files:
 - src/monitor/stop.sh
 - README.md
 - bin/thundercat
+- bin/thundercat-upgrade
 homepage: https://github.com/masterthought/thundercat
 licenses:
 - Apache 2.0