devinstall 0.0.3 → 0.0.4

data/.idea/devinstall.iml

@@ -15,7 +15,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.3.0.pre.8, ruby-1.9.3-p374) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.3.4, ruby-1.9.3-p374) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="getopt (v1.4.1, ruby-1.9.3-p374) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.3, ruby-1.9.3-p374) [gem]" level="application" />
   </component>

data/bin/pkg-tool

@@ -4,7 +4,9 @@ require 'getopt/long'
 require 'devinstall'
 require 'devinstall/settings'
 
+begin
 opt =Getopt::Long.getopts(
+    ['--version', '-v',],
     ['--package', '-p', Getopt::REQUIRED],
     ['--config',  '-c', Getopt::REQUIRED],
     ['--type',    '-t', Getopt::REQUIRED],
@@ -14,12 +16,25 @@ opt =Getopt::Long.getopts(
     ['--install', '-i', ],
     ['--help',    '-h', ],
 )
+rescue
+  puts "Invalid option in command line"
+  puts 'Usage: pkg-install --config|-c <file> --package|-p <package> --type|-t <package_type> --env|-e <environment> --build|--upload|--install'
+  exit!(1)
+end
 
+if opt['version']
+  puts "devinstall version #{Devinstall::VERSION}"
+  puts "pkg-tool version   #{Devinstall::VERSION}"
+  exit(0)
+end
 if opt['help']
-  p('Usage: pkg-install --package|-p <package> --config|-c <config file> --build|--upload|--install')
+  puts 'Usage: pkg-install --config|-c <file> --package|-p <package> --type|-t <package_type> --env|-e <environment> --build|--upload|--install'
+  exit!(0)
+end
+if !( opt['package'] && opt['config'] && opt['type'] && opt['env'] && (opt['build'] || opt['upload'] || opt['install']))
+  puts 'You must speciffy --config file, --package, --type and --env and one of the actions (--build, --install, --upload)'
   exit!(0)
 end
-
 Settings.load!(opt['config'])
 package=Pkg.new(opt['package'])
 

data/lib/devinstall/settings.rb

@@ -2,20 +2,20 @@ require 'yaml'
 require 'devinstall/deep_symbolize'
 
 module Settings
-  # again - it's a singleton, thus implemented as a self-extended module
   extend self
 
   @_settings = {}
   attr_reader :_settings
 
   def load!(filename, options = {})
+    unless File.exist?(filename)
+      puts "Unable to find config file \"#{filename}\""
+      exit!(1)
+    end
     newsets = YAML::load_file(filename).deep_symbolize
     newsets = newsets[options[:env].to_sym] if options[:env] && newsets[options[:env].to_sym]
     deep_merge!(@_settings, newsets)
   end
-
-  # Deep merging of hashes
-  # deep_merge by Stefan Rusterholz, see http://www.ruby-forum.com/topic/142809
   def deep_merge!(target, data)
     merger = proc { |_, v1, v2|
       Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }

data/lib/devinstall/version.rb

@@ -1,3 +1,3 @@
 module Devinstall
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/devinstall.rb

@@ -42,6 +42,7 @@ module Devinstall
 
     end
 
+    # @param [Symbol] type
     def build! (type)
       unless Settings.packages[@package].has_key?(type)
         puts("Package '#{@package}' cannot be built for the required environment")
@@ -61,6 +62,11 @@ module Devinstall
       rsync        =Settings.base[:rsync]
       local_folder =Settings.local[:folder]
       local_temp   =Settings.local[:temp]
+      build_command.sub('%f', Settings.build[:folder]).
+          sub('%t', Settings.build[:target]).
+          sub('%p', @package.to_s).
+          sub('%T', type.to_s)
+
       system("#{rsync} -az #{local_folder}/ #{build[:user]}@#{build[:host]}:#{build[:folder]}")
       system("#{ssh} #{build[:user]}@#{build[:host]} -c \"#{build_command}\"")
       @package_files[type].each do |p|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devinstall
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler