winter 0.0.2 → 0.0.3

data/README.md

@@ -83,13 +83,15 @@ All commands that need a `Winterfile` will use the default filename 'Winterfile'
 ```bash
 $ winter
 Commands:
-  winter build [Winterfile]     # Build a service from a Winterfile
-  winter help [COMMAND]         # Describe available commands or one specific...
-  winter start [Winterfile]     # Start the services in [Winterfile] 
-  winter status                 # Show status of available services
-  winter stop [Winterfile]      # Stop the services in [Winterfile]
-  winter validate [Winterfile]  # (optional) Check the configuration files
-  winter version                # Display version information.
+  winter build [Winterfile]                      # Build a service from a Win...
+  winter fetch <URL|GROUP> [artifact] [version]  # Download the Winterfile an...
+  winter help [COMMAND]                          # Describe available command...
+  winter start [Winterfile]                      # Start the services in [Win...
+  winter status                                  # Show status of available s...
+  winter stop [Winterfile]                       # Stop the services in [Wint...
+  winter validate [Winterfile]                   # (optional) Check the confi...
+  winter version                                 # Display version information.
+
 ```
 
 #### Build
@@ -105,6 +107,17 @@ Build a service from a Winterfile
       [--debug=DEBUG]      # Set log level to debug.
       [--local=LOCAL]      # Resolve dependencies only from local repository
 
+#### Fetch
+
+    Download the Winterfile and configuration from a URL.
+
+    Usage:
+      winter fetch <URL|GROUP> [artifact] [version]
+
+    Options:
+          [--debug=DEBUG]                     # Set log level to debug.
+      --repos, [--repositories=REPOSITORIES]  # Comma separated list of repositories to search.
+
 #### Start
 
 Start the services in [Winterfile] 

data/example/Winterfile

@@ -1,6 +1,5 @@
 name "osgi_sample"
 
-repo "~/.m2/repository"
 repo "http://artifactory:8081/artifactory/"
 
 read "conf/default/wf_config.json"

data/lib/winter/cli.rb

@@ -18,6 +18,7 @@ require 'winter/dsl'
 require 'winter/logger'
 require 'winter/version'
 require 'winter/service/build'
+require 'winter/service/fetch'
 require 'winter/service/start'
 require 'winter/service/status'
 require 'winter/service/stop'
@@ -88,6 +89,24 @@ module Winter
       s.build( winterfile, options )
     end
 
+    desc "fetch <URL|GROUP> [artifact] [version]", "Download the Winterfile and configuration from a URL."
+    method_option :debug, :desc => "Set log level to debug."
+    method_option :repositories, :desc => "Comma separated list of repositories to search.", :default => '', :aliases => "--repos"
+    def fetch( url_or_group, artifact=nil, version='LATEST' )
+      $LOG.level = Logger::DEBUG if options[:debug]
+      s = Winter::Service.new
+      if( url_or_group =~ /^http:/ ) 
+        s.fetch_url url_or_group
+      #elsif( !url_or_group.nil? && !artifact.nil? && !version.nil? )
+      elsif( !artifact.nil? )
+        repos = options[:repositories] || ''
+        repos = repos.split(',') 
+        s.fetch_GAV url_or_group, artifact, version, repos
+      else
+        $LOG.error "Invalid arguments. See `winter help fetch`."
+      end
+    end
+
   end #class
 end #module
 

data/lib/winter/dependency.rb

@@ -39,7 +39,7 @@ module Winter
     end
 
     def getMaven
-      dest_file = File.join(@destination,"#{@artifact}-#{@version}.#{@package}")
+      dest_file = File.join(@destination,outputFilename)
 
       c =  "mvn org.apache.maven.plugins:maven-dependency-plugin:2.5:get " 
       c << " -DremoteRepositories=#{@repositories.join(',').shellescape}" 
@@ -56,15 +56,19 @@ module Winter
         c << " -q"
       end
 
+      $LOG.debug c
       result = system( c )
       if result == false
-        $LOG.debug c
         $LOG.error("Failed to retrieve artifact: #{@group}:#{@artifact}:#{@version}:#{@package}")
       else
         $LOG.info "#{@group}:#{@artifact}:#{@version}:#{@package}"
         $LOG.debug dest_file
       end
+      return result
+    end
 
+    def outputFilename
+      "#{@artifact}-#{@version}.#{@package}"
     end
   end
 

data/lib/winter/dsl.rb

@@ -40,6 +40,9 @@ module Winter
 
     def self.evaluate( winterfile, options={} )
       # Must create instance for instance_eval to have correct scope
+      if !File.exists?(winterfile)
+        raise "#{winterfile} not found."
+      end
       dsl = DSL.new options
       res = dsl.eval_winterfile winterfile
       validate(res)
@@ -95,8 +98,8 @@ module Winter
       dep.version       = version
       dep.repositories  = @repositories
       dep.package       = options[:package] || 'jar'
-      dep.offline       = @options['offline'] || @options['offline'] == 'true'
-      dep.transative    = true
+      dep.offline       = @options['local'] || @options['local'] == 'true'
+      dep.transative    = false
       dep.destination   = File.join(Dir.getwd,RUN_DIR,@name,LIBS_DIR)
       #dep.verbose       = true
 
@@ -112,7 +115,7 @@ module Winter
       dep.version       = version
       dep.repositories  = @repositories
       dep.package       = options[:package] || 'jar'
-      dep.offline       = @options['offline'] || @options['offline'] == 'true'
+      dep.offline       = @options['local'] || @options['local'] == 'true'
       dep.transative    = false
       dep.destination   = File.join(Dir.getwd,RUN_DIR,@name,BUNDLES_DIR)
       #dep.verbose       = true

data/lib/winter/service/build.rb

@@ -22,7 +22,12 @@ module Winter
 
     def build(winterfile, options)
       #dsl = DSL.new options
-      dsl = DSL.evaluate winterfile, options
+      begin
+        dsl = DSL.evaluate winterfile, options
+      rescue Exception=>e
+        $LOG.error e
+        exit
+      end
       dependencies = dsl[:dependencies]
       service = dsl[:config]['service']
       service_dir = File.join(WINTERFELL_DIR,RUN_DIR,service)
@@ -41,6 +46,14 @@ module Winter
               $LOG.debug "Deleted service directory #{service_dir}"
             end
           end
+
+          # re-evaluate the DSL to get new dependencies
+          begin
+            dsl = DSL.evaluate winterfile, options
+          rescue Exception=>e
+            $LOG.error e
+            exit
+          end
         end
       end
       
@@ -58,18 +71,32 @@ module Winter
         end while pid
       end
 
+      error = false
       dependencies.each do |dep|
         while (active_threads >= max_threads) do
-          #puts "Total active threads: #{active_threads}"
+          $LOG.debug "Total active threads: #{active_threads}"
+          #$LOG.debug "threads: #{active_threads}"
           sleep 1 
         end
-        active_threads += 1
-        fork do 
-          dep.getMaven
+        #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
+          end
+        else
+          $LOG.info "Already have #{dep.outputFilename}"
         end
       end
+
       #wait for stragglers
-      sleep 1 while (active_threads > 0) 
+      while (active_threads > 0) do 
+        sleep 1 
+        $LOG.debug "threads: #{active_threads}"
+      end
+
+      exit 99 if error
     end
   end
 end

data/lib/winter/service/fetch.rb

@@ -0,0 +1,76 @@
+# Copyright 2013 LiveOps, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not 
+# use this file except in compliance with the License.  You may obtain a copy 
+# of the License at:
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
+# License for the specific language governing permissions and limitations 
+# under the License.
+
+require 'winter/constants'
+require 'winter/logger'
+require 'winter/dependency'
+
+require 'fileutils'
+
+module Winter
+  class Service
+
+    def fetch_url( url )
+
+      begin
+        uri = URI.parse(url)
+        file = uri.path.split('/').last
+
+        content = Net::HTTP.get uri
+        File.open(file, 'w') do |file|
+          file.write content
+        end
+      rescue Exception=>e
+        $LOG.error "Could not fetch winter configuration from : #{url}"
+        $LOG.debug e
+      end
+
+      extract_jar file
+    end
+    
+    def fetch_GAV(group, artifact, version, repos=[])
+      dep = Dependency.new
+      dep.artifact      = artifact
+      dep.group         = group
+      dep.version       = version
+      dep.repositories  = repos
+      #dep.package       = options[:package] || 'jar'
+      #dep.offline       = @options['offline'] || @options['offline'] == 'true'
+      dep.transative    = true
+      dep.destination   = File.join('.')
+
+      dep.getMaven
+
+      extract_jar "#{artifact}-#{version}.jar"
+    end
+
+    def extract_jar( file )
+      begin
+        system "jar -xf #{file}"
+      rescue Exception=>e
+        $LOG.error "#{file} is corrupt or invalid."
+        $LOG.debug e
+      end
+      
+      cleanup file
+    end
+
+    def cleanup(file)
+      File.delete(file) if File.exists?(file)
+    end
+
+    private :cleanup, :extract_jar
+  end
+
+end

data/lib/winter/service/start.rb

@@ -43,7 +43,13 @@ module Winter
     end
 
     def start(winterfile, options)
-      dsl = DSL.evaluate winterfile, options
+      begin
+        dsl = DSL.evaluate winterfile, options
+      rescue Exception=>e
+        $LOG.error e
+        exit
+      end
+
       dsl[:dependencies].each do |dep|
         $LOG.debug "dependency: #{dep.group}.#{dep.artifact}"
       end

data/lib/winter/service/stop.rb

@@ -20,9 +20,14 @@ module Winter
 
     # stop winterfell service
     def stop(winterfile='Winterfile', options={})
-      tmp = DSL.evaluate winterfile, options
-      config = tmp[:config]
-      service = config['service']
+      begin
+        tmp = DSL.evaluate winterfile, options
+        config = tmp[:config]
+        service = config['service']
+      rescue Exception=>e
+        $LOG.error e
+        exit
+      end
 
       @service_dir = File.join(File.split(winterfile)[0],RUN_DIR,service)
       f_pid = File.join(@service_dir, "pid")
@@ -34,9 +39,11 @@ module Winter
         end
 
         begin
-          Process.getpgid pid
-          Process.kill("TERM", -Process.getpgid(pid))
-        rescue
+          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." )
         end
 

data/lib/winter/service/validate.rb

@@ -19,7 +19,12 @@ module Winter
   class Service
 
     def validate( winterfile='Winterfile', options={} )
-      DSL.evaluate winterfile, options
+      begin
+        DSL.evaluate winterfile, options
+      rescue Exception=>e
+        $LOG.error e
+        exit
+      end
     end
 
   end

data/lib/winter/version.rb

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

data/spec/cli_spec.rb

@@ -17,6 +17,7 @@ SimpleCov.start
 
 require 'winter'
 require 'winter/cli'
+require 'fileutils'
 
 describe Winter do
 
@@ -28,6 +29,17 @@ describe Winter do
     end
   end
 
+  describe "Fetch a jar" do
+    it "Fetches a jar from a URL" do
+      begin 
+        lambda {
+          cli = Winter::CLI.new
+          cli.fetch 'com.liveops.sample', 'winter', '1.0.0-SNAPSHOT'
+        }.should_not raise_error
+      end
+    end
+  end
+
   describe "validate" do
     it "Reads a local pom file" do
       begin
@@ -54,7 +66,7 @@ describe Winter do
     it "Build a service from a manifest" do
       begin
         lambda {
-          args = ["build", "spec/sample_data/Winterfile", "--clean"]
+          args = ["build", "spec/sample_data/Winterfile", "--clean", "--local"]
           cli = Winter::CLI.start( args )
         }.should_not raise_error
         Dir["run/default/libs"].include? "maven-dependency-plugin-2.5.jar"
@@ -65,12 +77,20 @@ describe Winter do
 
   describe 'start and stop a service : ' do
     context "start, status and stop " do
+      before "build service to get artifacts." do
+        lambda {
+          args = ["build", "spec/sample_data/Winterfile", "--clean", "--local"]
+          cli = Winter::CLI.start( args )
+        }.should_not raise_error
+      end
+
       it "Start, status and stop a service" do
         begin
           Dir.chdir(File.split("spec/sample_data/Winterfile")[0]) do
             lambda {
-              Winter::CLI.start ["start" , "--debug"]
+              Winter::CLI.start ["start"]
               Winter::CLI.start ["status"]
+              #Winter::CLI.start ["stop"]
             }.should_not raise_error
             #lambda {
             #  puts "TRYING STOP"
@@ -93,8 +113,10 @@ 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" )
     end
   end
 

data/winter.gemspec

@@ -18,6 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features|coverage)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 1.9.1'
+
+  spec.add_runtime_dependency "thor", "~> 0.18.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.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +90,7 @@ files:
 - lib/winter/dsl.rb
 - lib/winter/logger.rb
 - lib/winter/service/build.rb
+- lib/winter/service/fetch.rb
 - lib/winter/service/start.rb
 - lib/winter/service/status.rb
 - lib/winter/service/stop.rb
@@ -101,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: