winter 0.0.3 → 0.1.0

data/lib/winter/dependency.rb

@@ -13,6 +13,9 @@
 # under the License.
 
 require 'winter/logger'
+require 'fileutils'
+require 'digest/md5'
+require 'net/http'
 
 module Winter
 
@@ -37,15 +40,100 @@ module Winter
       @verbose      = false 
       @destination  = '.'
     end
+    
+    def get    
+      if ! File.directory?(@destination)  
+        $LOG.debug "Create the destination folder if its not already there."
+        FileUtils.mkdir_p @destination  
+      end
+      #Try and get file in a couple different ways. If we succeed then move on. 
+      #Artifacts in your local .m2 ALWAYS take precedence over a remote artifact...
+      #Unless we fail so hard we end up using mvn as a last ditched effort. 
+      success = getLocalM2
+      success = getRestArtifactory if ! success and ! @offline 
+      success = getMaven if ! success and system( 'which mvn > /dev/null' ) 
+      if ! success
+        $LOG.info "[failed] #{outputFilename}"
+      end
+      return success
+    end
+    
+    def artifactory_path
+      "#{@group.gsub(/\./,'/')}/#{@artifact}/#{@version}/#{@artifact}-#{@version}.#{@package}"
+    end
 
-    def getMaven
-      dest_file = File.join(@destination,outputFilename)
+    def dest_file
+      File.join(@destination,outputFilename)
+    end
+    
+    def restRequest(uri)
+      response = Net::HTTP.get_response(uri)
+      return response.body if response.is_a?(Net::HTTPSuccess)
+      $LOG.debug "#{outputFilename}: Rest request to #{uri.inspect} #{response.inspect}"
+      raise "Rest request got a bad response code back [#{response.code}]" 
+    end
+    
+    def getRestArtifactory 
+      log_prefix = '[remote] '
+      $LOG.debug "#{log_prefix}#{outputFilename}: Attempting to fetch via the artifactory rest api."
+      #Loop through all the repos until something works
+      @repositories.each { |repo| 
+        begin
+          open(dest_file,"wb") { |file|
+            file.write(restRequest(URI.parse("#{repo}/#{artifactory_path}")))
+          }
+        rescue SocketError,RuntimeError => e # :( Maybe do better handling later. 
+          $LOG.error "#{log_prefix}#{outputFilename}: Unable to fetch Artifact from #{repo}/#{artifactory_path}"  
+          $LOG.debug e
+          next
+        end 
+        #Check to make sure the md5sum of what we downloaded matches what's in the artifactory.
+        begin
+          artifactory_md5 = restRequest(URI.parse("#{repo}/#{artifactory_path}.md5"))
+          my_md5 = Digest::MD5.file("#{dest_file}").hexdigest
+        rescue SocketError, RuntimeError => e # :( Do better handling later. 
+          $LOG.error "#{log_prefix}#{outputFilename}: Blew up while attempting to get md5s."
+        else
+          if artifactory_md5 == my_md5
+            $LOG.debug "#{log_prefix}#{outputFilename}: Successfully fetched via artifactory rest api."
+            $LOG.info "#{log_prefix}#{outputFilename}"
+            return true 
+          end
+          $LOG.error "#{log_prefix}#{outputFilename}: Comparing remote MD5 #{artifactory_md5} to local md5 #{my_md5} (#{dest_file})" 
+          $LOG.error "#{log_prefix}#{outputFilename}: Comparison failed. Deleting the 'bad' jar and moving on." 
+          FileUtils.rm(dest_file)
+        end
+      }
+      return false
+    end
+    
+    def getLocalM2 
+      log_prefix = "[local]  "
+      begin
+        artifact = "#{ENV["HOME"]}/.m2/repository/#{artifactory_path}"
+        $LOG.debug "#{log_prefix}#{outputFilename}: Copying #{artifact} to #{dest_file}"
+        FileUtils.cp(artifact,dest_file)
+      rescue Errno::ENOENT
+      	$LOG.debug "#{log_prefix}#{outputFilename}: #{artifact} does not exist."
+      rescue SystemCallError => e
+        $LOG.error "#{log_prefix}#{outputFilename}: Failed to copy file from local m2 repository."
+        $LOG.error e
+      else #Yay we got it
+        $LOG.debug "#{log_prefix}#{outputFilename}: Successfully copied from local m2 repository."
+        $LOG.info "#{log_prefix}#{outputFilename}"
+        return true
+      end
+      return false
+    end
 
+    #Depricated because its slow and expensive to use... leaving it here for now.
+    def getMaven
+      log_prefix = "[maven]  "
       c =  "mvn org.apache.maven.plugins:maven-dependency-plugin:2.5:get " 
       c << " -DremoteRepositories=#{@repositories.join(',').shellescape}" 
       c << " -Dtransitive=#{@transative}" 
       c << " -Dartifact=#{@group.shellescape}:#{@artifact.shellescape}:#{@version.shellescape}:#{@package.shellescape}" 
-      c << " -Ddest=#{dest_file.shellescape}"
+      c << " -Ddest=#{dest_file.shellescape} &>/dev/null"
 
       if @offline
         c << " --offline"
@@ -56,13 +144,12 @@ module Winter
         c << " -q"
       end
 
-      $LOG.debug c
       result = system( c )
       if result == false
-        $LOG.error("Failed to retrieve artifact: #{@group}:#{@artifact}:#{@version}:#{@package}")
+        $LOG.error("#{log_prefix}#{outputFilename}: Failed to retrieve artifact. -- #{c}")
       else
-        $LOG.info "#{@group}:#{@artifact}:#{@version}:#{@package}"
-        $LOG.debug dest_file
+        $LOG.info "#{log_prefix}#{@group}:#{@artifact}:#{@version}:#{@package}"
+        $LOG.debug "#{log_prefix}#{dest_file}"
       end
       return result
     end

data/lib/winter/dsl.rb

@@ -144,7 +144,9 @@ module Winter
     end
 
     def conf( dir )
-      process_templates( dir, File.join(WINTERFELL_DIR,RUN_DIR,@name,'conf') )
+      #We strip off the final / to normalize the input.
+      #If we don't do that then process_templates will end up with crazy file names. 
+      process_templates( dir.sub(/\/$/,""), File.join(WINTERFELL_DIR,RUN_DIR,@name,'conf') )
     end
 
     def read( file )

data/lib/winter/service/build.rb

@@ -60,30 +60,32 @@ module Winter
       #I hate waiting so this is going to become faster.
       max_threads = 10 #make this configurable later. 
       active_threads = 0 
+      error = false
       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
+          pid, status = waitpid2(-1, Process::WNOHANG) 
+          if pid
+            active_threads -= 1 
+            error = true if status.exitstatus > 0 
+          end
           rescue Errno::ECHILD
             break 
         end while pid
       end
 
-      error = false
       dependencies.each do |dep|
         while (active_threads >= max_threads) do
           $LOG.debug "Total active threads: #{active_threads}"
-          #$LOG.debug "threads: #{active_threads}"
           sleep 1 
         end
-        #File.join(@destination,"#{@artifact}-#{@version}.#{@package}")
         if !File.exists?(File.join(dep.destination,dep.outputFilename))
           active_threads += 1
           fork do 
-            result = dep.getMaven
-            error = true if result == false
+            #Get the dependency and Vomit up an error code if we fail
+            #If we don't do this then the main proc has no idea the build
+            # was garbage 
+            exit 1 unless dep.get
           end
         else
           $LOG.info "Already have #{dep.outputFilename}"

data/lib/winter/service/fetch.rb

@@ -34,6 +34,7 @@ module Winter
       rescue Exception=>e
         $LOG.error "Could not fetch winter configuration from : #{url}"
         $LOG.debug e
+        exit(-1)
       end
 
       extract_jar file
@@ -61,6 +62,7 @@ module Winter
       rescue Exception=>e
         $LOG.error "#{file} is corrupt or invalid."
         $LOG.debug e
+        exit(-1)
       end
       
       cleanup file

data/lib/winter/service/start.rb

@@ -70,86 +70,39 @@ module Winter
       @directives.merge! dsl[:directives]
 
       java_cmd = generate_java_invocation
-      java_cmd << " > #{@config['console']} 2>&1"
+      
+      if @config['daemonize']
+        java_cmd <<  " 2>&1 " #"don't eat the log thats evil"
+      else 
+        java_cmd << " > #{@config['console']} 2>&1"
+      end
       $LOG.debug java_cmd
 
-      # execute
+      # 
       if( File.exists?(File.join(@service_dir, "pid")) )
         $LOG.error "PID file already exists. Is the process running?"
         exit
       end
-      pid_file = File.open(File.join(@service_dir, "pid"), "w")
 
       # 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)
-
+      
+      exec(java_cmd) if @config['daemonize'] #Let the child eat winter so things are awesome for daemontools
+      #We never hit the past this point if  we went to daemonize mode.
+      
+      #If we're not trying to run as a daemon just fork and let the subprocess be eaten
       java_pid = fork do
         exec(java_cmd)
       end
 
+      pid_file = File.open(File.join(@service_dir, "pid"), "w")
       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
@@ -172,7 +125,7 @@ module Winter
       felix_jar = File.join(@felix.destination,"#{@felix.artifact}-#{@felix.version}.#{@felix.package}")
 
       # start building the command
-      cmd = [ "#{java_bin.shellescape} -server" ]
+      cmd = [ "exec #{java_bin.shellescape} -server" ] 
       cmd << (@config["64bit"]==true ? " -d64 -XX:+UseCompressedOops":'')
       cmd << " -XX:MaxPermSize=256m -XX:NewRatio=3"
       cmd << " -Xmx#{@config['jvm.mx']}" 

data/lib/winter/service/status.rb

@@ -31,14 +31,17 @@ module Winter
         service = f_pid.sub( %r{#{WINTERFELL_DIR}/#{RUN_DIR}/([^/]+)/pid}, '\1')
         pid_file = File.open(f_pid, "r")
         pid = pid_file.read().to_i
-      
-        begin
-          Process.getpgid( pid )
-          running = "Running"
-        rescue Errno::ESRCH
-          running = "Dangling pid file : #{f_pid}"
+        
+        if pid <= 0 
+          running = "A pid of zero was found... something bad is going on" 
+        else 
+          begin
+            Process.getpgid( pid )
+            running = "Running"
+          rescue Errno::ESRCH
+            running = "Dangling pid file : #{f_pid}"
+          end
         end
-
         services["#{service} (#{pid})"] = "#{running}"
       end
 

data/lib/winter/service/stop.rb

@@ -31,23 +31,39 @@ module Winter
 
       @service_dir = File.join(File.split(winterfile)[0],RUN_DIR,service)
       f_pid = File.join(@service_dir, "pid")
-
       if File.exists?(f_pid)
-        pid = nil;
+        pid = nil
+        pid_string = nil
         File.open(f_pid, "r") do |f|
-          pid = f.read().to_i
+          pid_string = f.read()
+          pid = pid_string.to_i
         end
 
-        begin
-          pgid = Process.getpgid pid
-          pgid *= -1 if !config['daemonize']
-          Process.kill("TERM", pgid)
-        rescue => e
-          $LOG.debug( e )
-          $LOG.info( "Process #{pid} does not exist. Removing pid file." )
+        #Send a TERM to the container if we have a non bogus pid
+        if pid > 0 
+          begin
+            $LOG.info("Attempting to terminate #{pid}")
+            Process.kill("TERM", pid)
+          rescue => e
+            $LOG.debug( e )
+            $LOG.info("Unable to control process with pid #{pid}.")
+            $LOG.info("Either your user has insufficent rights, or the process doesn't exist")
+          end
+          
+          #Wait for things to stop. 
+          begin 
+            $LOG.info("Waiting for the process with pid #{pid} to stop")
+            sleep 1 while Process.kill(0,pid)
+          rescue => e
+            $LOG.info("The container seems to have exited.")
+          end
+        else
+          $LOG.info("An invalid pid value was found in the pid file. (\"#{pid_string}\" was parsed as #{pid})")
         end
-
+        
+        #If things worked (Or we couldn't find a pid)... then we're good to delete. 
         begin
+          $LOG.info("Removing the pid file")
           File.unlink(f_pid)
         rescue
           $LOG.error( "Error deleting PID file." )

data/lib/winter/version.rb

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

data/spec/cli_spec.rb

@@ -34,7 +34,8 @@ describe Winter do
       begin 
         lambda {
           cli = Winter::CLI.new
-          cli.fetch 'com.liveops.sample', 'winter', '1.0.0-SNAPSHOT'
+          cli.fetch 'com.liveops.sample', 'sample', '1.0.0-SNAPSHOT'
+          #cli.fetch 'http://artifactory:8081/artifactory/libs-all/', 'sample', '1.0.0-SNAPSHOT'
         }.should_not raise_error
       end
     end
@@ -66,7 +67,7 @@ describe Winter do
     it "Build a service from a manifest" do
       begin
         lambda {
-          args = ["build", "spec/sample_data/Winterfile", "--clean", "--local"]
+          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"
@@ -79,7 +80,7 @@ describe Winter do
     context "start, status and stop " do
       before "build service to get artifacts." do
         lambda {
-          args = ["build", "spec/sample_data/Winterfile", "--clean", "--local"]
+          args = ["build", "spec/sample_data/Winterfile", "--clean"]
           cli = Winter::CLI.start( args )
         }.should_not raise_error
       end
@@ -90,12 +91,8 @@ describe Winter do
             lambda {
               Winter::CLI.start ["start"]
               Winter::CLI.start ["status"]
-              #Winter::CLI.start ["stop"]
+              Winter::CLI.start ["stop"]
             }.should_not raise_error
-            #lambda {
-            #  puts "TRYING STOP"
-            #  Winter::CLI.start ["stop"]
-            #}.should_not raise_error
           end
         end
       end
@@ -113,7 +110,7 @@ describe Winter do
 
     after do
       Dir.chdir(File.split("spec/sample_data/Winterfile")[0]) do
-        #Winter::CLI.start ["stop"]
+        Winter::CLI.start ["stop"]
       end
 
       FileUtils.rm_r( "spec/sample_data/run" )

data/winter.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.1'
 
-  spec.add_runtime_dependency "thor", "~> 0.18.0"
+  spec.add_runtime_dependency "thor", "~> 0.14.0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement