winter 0.0.1 → 0.0.2

data/README.md

@@ -1,6 +1,8 @@
 # Winter
 
-Winter is a system for maintaining the configuration of java web applications with a specific focus on the Felix OSGi container. Simply create a `Winterfile` and describe the configuration of your application with the Winter DSL. You can then use the `winter` CLI tool to `winter build` the appliation. This will download all the necessary dependencies for your application. When the build is complete, you can run it with `winter start`.
+[![Gem Version](https://badge.fury.io/rb/winter.png)](http://badge.fury.io/rb/winter)
+
+Winter is a system for maintaining the configuration of java web applications with a specific focus on the Felix OSGi container. Simply create a `Winterfile` and describe the configuration of your application with the Winter DSL. You can then use the `winter` CLI tool to `winter build` the application. This will download all the necessary dependencies for your application. When the build is complete, you can run it with `winter start`.
 
 ## Installation from Rubygems
 
@@ -8,7 +10,7 @@ Winter is a system for maintaining the configuration of java web applications wi
 
 ## Installation from source
 
-    $ git clone https://github.liveops.com/swilson/winter.git && cd winter
+    $ git clone git@github.com:liveops/winter.git && cd winter
     $ gem build winter.gemspec
     $ gem install winter*.gem
 

data/example/Winterfile

@@ -17,7 +17,7 @@ end
 #lib 'org.apache.felix', 'org.apache.felix.configadmin', '1.4.0'
 
 # core OSGi artifacts
-felix 'org.apache.felix', 'org.apache.felix.main', '3.0.1'
+felix 'org.apache.felix', 'org.apache.felix.main', '4.0.2'
 lib 'org.apache.felix', 'org.apache.felix.shell', '1.4.3'
 lib 'org.apache.felix', 'org.apache.felix.shell.remote', '1.1.2'
 lib 'org.apache.felix', 'org.apache.felix.scr', '1.6.2'

data/lib/winter/cli.rb

@@ -47,9 +47,9 @@ module Winter
     end
 
     desc "start [Winterfile]", "Start the services in [Winterfile] "
-    method_option :group,   :desc => "Config group"
-    #method_option :verbose, :desc => "Verbose maven output"
-    method_option :debug,   :desc => "Set log level to debug."
+    method_option :group,     :desc => "Config group"
+    method_option :debug,     :desc => "Set log level to debug."
+    method_option :daemonize, :desc => "Keep winter process running to trap system signals."
     method_option :console, :desc => "Send console output to [file]",
       :default => "/dev/null", :aliases => "--con"
     def start(winterfile='Winterfile')
@@ -67,16 +67,20 @@ module Winter
 
     desc "status", "Show status of available services"
     def status
+      running = 0
       s = Winter::Service.new
       s.status.each do |service, status|
         $LOG.info " #{service} : #{status}"
+        running += 1 if status =~ /Running/i
       end
+      $LOG.info "#{running} services are running."
     end
 
     desc "build [Winterfile]", "Build a service from a Winterfile"
     method_option :group,   :desc => "Config group"
     method_option :verbose, :desc => "Verbose maven output"
     method_option :debug,   :desc => "Set log level to debug."
+    method_option :clean,   :desc => "Remove all artifacts before building."
     method_option :local,   :desc => "Resolve dependencies only from local repository"
     def build( winterfile='Winterfile' )
       $LOG.level = Logger::DEBUG if options[:debug]

data/lib/winter/dsl.rb

@@ -19,13 +19,8 @@ require 'json'
 
 require 'maven_pom'
 
-#require 'maven_gem/pom_fetcher'
-#require 'pom_spec'
-
-#require 'winter/bundles'
 require 'winter/constants'
 require 'winter/dependency'
-#require 'winter/json_util'
 require 'winter/logger'
 require 'winter/templates'
 
@@ -54,7 +49,7 @@ module Winter
       contents ||= File.open(winterfile.to_s, "rb"){|f| f.read}
       
       # set CWD to where the winterfile is located
-      Dir.chdir (File.split(winterfile.to_s)[0]) do
+      Dir.chdir(File.split(winterfile.to_s)[0]) do
         instance_eval(contents)
       end
       
@@ -137,7 +132,6 @@ module Winter
 
       pom_file = MavenPom.fetch(pom)
       pom_spec = MavenPom.parse_pom(pom_file)
-      #$LOG.debug pom_spec.dependencies
       pom_spec.dependencies.each do |dep|
         $LOG.debug dep
         if dep[:scope] == 'provided'
@@ -147,7 +141,6 @@ module Winter
     end
 
     def conf( dir )
-      #$LOG.debug( dir << " " << File.join(WINTERFELL_DIR,RUN_DIR,'conf') )
       process_templates( dir, File.join(WINTERFELL_DIR,RUN_DIR,@name,'conf') )
     end
 

data/lib/winter/service/build.rb

@@ -14,20 +14,62 @@
 
 require 'winter/constants'
 require 'winter/logger'
+require 'winter/service/status'
+include Process
 
 module Winter
   class Service
 
     def build(winterfile, options)
       #dsl = DSL.new options
-      tmp = DSL.evaluate winterfile, options
-      dependencies = tmp[:dependencies]
+      dsl = DSL.evaluate winterfile, options
+      dependencies = dsl[:dependencies]
+      service = dsl[:config]['service']
+      service_dir = File.join(WINTERFELL_DIR,RUN_DIR,service)
       #$LOG.debug dependencies
+      
+      if options['clean'] and File.directory?(service_dir)
+        s = Winter::Service.new
+        stats = s.status
+        if stats.size == 0
+          FileUtils.rm_r service_dir
+          $LOG.debug "Deleted service directory #{service_dir}"
+        else
+          stats.each do |srvs,status|
+            if service == srvs && status !~ /running/i
+              FileUtils.rm_r service_dir
+              $LOG.debug "Deleted service directory #{service_dir}"
+            end
+          end
+        end
+      end
+      
+      #I hate waiting so this is going to become faster.
+      max_threads = 10 #make this configurable later. 
+      active_threads = 0 
+      Signal.trap("CHLD") do 
+        #Reap everything you possibly can.
+        begin
+          pid = waitpid(-1, Process::WNOHANG) 
+          #puts "reaped #{pid}" if pid
+          active_threads -= 1 if pid
+          rescue Errno::ECHILD
+            break 
+        end while pid
+      end
 
       dependencies.each do |dep|
-        dep.getMaven
+        while (active_threads >= max_threads) do
+          #puts "Total active threads: #{active_threads}"
+          sleep 1 
+        end
+        active_threads += 1
+        fork do 
+          dep.getMaven
+        end
       end
+      #wait for stragglers
+      sleep 1 while (active_threads > 0) 
     end
-
   end
 end

data/lib/winter/service/start.rb

@@ -14,6 +14,7 @@
 
 require 'winter/constants'
 require 'winter/logger'
+require 'winter/service/stop'
 require 'shellwords'
 
 # TODO This needs a larger refactor to make it more functional and less reliant
@@ -72,13 +73,77 @@ module Winter
         exit
       end
       pid_file = File.open(File.join(@service_dir, "pid"), "w")
-      pid = fork do
+
+      # Normally, we'd just use Process.daemon for ruby 1.9, but for some
+      # reason the OSGi container we're using crashes when the CWD is changed
+      # to '/'. So, we'll just leave the CWD alone.
+      #Process.daemon(Dir.getwd,nil)
+
+      java_pid = fork do
         exec(java_cmd)
       end
+
+      pid = java_pid
+      pid = Process.pid if @config['daemonize'] 
       pid_file.write(pid)
       pid_file.close      
 
       $LOG.info "Started #{@config['service']} (#{pid})"
+
+      if( @config['daemonize'] )
+        stay_resident(java_pid,winterfile)
+      end
+    end
+
+    def stay_resident( child_pid, winterfile )
+      interrupted = false
+
+      #TERM, CONT STOP HUP ALRM INT and KILL
+      Signal.trap("EXIT") do
+        $LOG.debug "EXIT Terminating... #{$$}"
+        interrupted = true
+        begin
+          stop winterfile
+         # not working...
+         # Process.getpgid child_pid 
+         # Process.kill child_pid #skipped if process is alredy dead
+        rescue
+          $LOG.debug "Child pid (#{child_pid}) is already gone."
+        end
+      end
+      Signal.trap("HUP") do
+        $LOG.debug "HUP Terminating... #{$$}"
+        interrupted = true
+      end
+      Signal.trap("TERM") do
+        $LOG.debug "TERM Terminating... #{$$}"
+        interrupted = true
+      end
+      Signal.trap("KILL") do
+        $LOG.debug "KILL Terminating... #{$$}"
+        interrupted = true
+      end
+      Signal.trap("CONT") do
+        $LOG.debug "CONT Terminating... #{$$}"
+        interrupted = true
+      end
+      Signal.trap("ALRM") do
+        $LOG.debug "ALRM Terminating... #{$$}"
+        interrupted = true
+      end
+      Signal.trap("INT") do
+        $LOG.debug "INT Terminating... #{$$}"
+        interrupted = true
+      end
+      Signal.trap("CHLD") do
+        $LOG.debug "CHLD Terminating... #{$$}"
+        interrupted = true
+      end
+      #Process.detach(pid)
+
+      while 1
+        exit 0 if interrupted
+      end
     end
 
     def find_java

data/lib/winter/service/status.rb

@@ -21,7 +21,8 @@ module Winter
     def status
       pid_files = Dir.glob(File.join(WINTERFELL_DIR,RUN_DIR, "**", "pid"))
       if( pid_files.length == 0 )
-        $LOG.info "No services are running."
+        #$LOG.info "No services are running."
+        return {}
       end
 
       services = {}

data/lib/winter/service/stop.rb

@@ -32,7 +32,14 @@ module Winter
         File.open(f_pid, "r") do |f|
           pid = f.read().to_i
         end
-        Process.kill("TERM", -Process.getpgid(pid))
+
+        begin
+          Process.getpgid pid
+          Process.kill("TERM", -Process.getpgid(pid))
+        rescue
+          $LOG.info( "Process #{pid} does not exist. Removing pid file." )
+        end
+
         begin
           File.unlink(f_pid)
         rescue

data/lib/winter/templates.rb

@@ -22,6 +22,9 @@ def process_templates(source_templates, destination_dir)
     dest = destination_dir + tmpl.sub(%r{#{source_templates}},"").sub(/\.erb$/, "")
     #$LOG.debug "Processing: #{dest}"
     FileUtils.mkpath File.dirname(dest)
-    File.new(dest,'w').write(result)
+    File.open(dest,'w') do |f| 
+      f.write(result)
+      f.close()
+    end
   end
 end

data/lib/winter/version.rb

@@ -13,5 +13,5 @@
 # under the License.
 
 module Winter
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/cli_spec.rb

@@ -54,7 +54,7 @@ describe Winter do
     it "Build a service from a manifest" do
       begin
         lambda {
-          args = ["build", "spec/sample_data/Winterfile"]
+          args = ["build", "spec/sample_data/Winterfile", "--clean"]
           cli = Winter::CLI.start( args )
         }.should_not raise_error
         Dir["run/default/libs"].include? "maven-dependency-plugin-2.5.jar"
@@ -67,7 +67,7 @@ describe Winter do
     context "start, status and stop " do
       it "Start, status and stop a service" do
         begin
-          Dir.chdir (File.split("spec/sample_data/Winterfile")[0]) do
+          Dir.chdir(File.split("spec/sample_data/Winterfile")[0]) do
             lambda {
               Winter::CLI.start ["start" , "--debug"]
               Winter::CLI.start ["status"]
@@ -92,7 +92,7 @@ describe Winter do
     end
 
     after do
-      Dir.chdir (File.split("spec/sample_data/Winterfile")[0]) do
+      Dir.chdir(File.split("spec/sample_data/Winterfile")[0]) do
         Winter::CLI.start ["stop"]
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler