devinstall 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65c942b9af93dd07a39c2029c07bde331ac05ea5
-  data.tar.gz: 5225f01ff5e97008bb5ae05a45f44563d9541ba8
+  metadata.gz: c2f2c6937b701ffa7244cbbcad05ec74cf378383
+  data.tar.gz: febe47467ab63606b4bf1c9d43fe1b0fb331da3b
 SHA512:
-  metadata.gz: b5f54243bf6f26420dae3a3f60c0266aaa9ceca9b551822fbbe1ecc4eb80203bcace3ba406efedc605889d48d84a3d440bc9ef6883a98215b0e5d7c5b59008d3
-  data.tar.gz: 561bb68c5072a1b11b110ed18632560c0f1dca94702f8e3697ae255f2c9bc8d6a75d08dc07ef8ccaf65b717db07c695ff6ef3594b2426f62fd275e3db6067f05
+  metadata.gz: 24d0732f67276785ae6785c9df8ac46f275b711932ad355b59c5064e108d13dcc244ae0cf08a6935349d8250f2e0eaebe78f4e6afe953b2ba69dd03899315f5a
+  data.tar.gz: 9a0cbe36d5203618ce5046a207db353e5bb2e5b5b0575d2e2766da629ac32a02b84a89af1ae8982ebb8b9911c3423a27130e81a0f0cb27bff78fe673c3bde539

data/bin/pkg-tool

@@ -3,7 +3,6 @@
 require 'getopt/long'
 require 'devinstall'
 require 'devinstall/settings'
-require 'pp'
 
 begin
   opt =Getopt::Long.getopts(
@@ -15,12 +14,13 @@ begin
       ['--build', '-b',],
       ['--upload', '-u',],
       ['--install', '-i',],
+      ['--test', '-t,'],
       ['--help', '-h',],
   )
 rescue
   puts 'Invalid option in command line'
   help!
-  exit!(1)
+  exit! 1
 end
 
 def help!
@@ -38,21 +38,21 @@ if opt['help']
   exit!(0)
 end
 unless opt['config']
-  puts 'You must specify a config file'
-  exit! 1
+  puts 'You must specify the config file'
+  exit! 1 # Exit 
 end
-Settings.load!(opt['config'])
-[:package, :type, :env].each do |a|
-  if Settings.defaults[a] and not opt[a.to_s]
-    opt[a.to_s]=Settings.defaults[a]
+Settings.load! opt['config']
+
+['package', 'env', 'type'].each do |o|
+  if Settings.defaults[o.to_sym]
+    opt[o]=Settings.defaults[o.to_sym]
   end
 end
-puts "Working on #{opt['package']} for environment #{opt['env']}"
-unless 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
 
+unless opt['package'] && opt['config'] && opt['type'] && opt['env'] && (opt['build'] || opt['upload'] || opt['install'] || opt['test'])
+  puts 'You must speciffy --config file, --package, --type and --env and one of the actions (--build, --install, --upload or --test)'
+  exit! 1
+end
 package=Devinstall::Pkg.new(opt['package'])
 
 if opt['build']
@@ -62,5 +62,8 @@ elsif opt['install']
   package.install(opt['env'].to_sym)
 elsif opt['upload']
   package.build(opt['type'].to_sym)
+  package.run_tests(opt['env'].to_sym)
   package.upload(opt['env'].to_sym)
+elsif opt['test']
+  package.run_tests(opt['env'].to_sym)
 end

data/lib/devinstall/settings.rb

@@ -4,6 +4,7 @@ class Hash
   include DeepSymbolizable
 end
 
+
 module Settings
 
   extend self
@@ -31,6 +32,10 @@ module Settings
     @_settings[:defaults]
   end
 
+  def tests
+    @_settings[:tests]
+  end
+
   def base
     @_settings[:base]
   end

data/lib/devinstall/version.rb

@@ -1,3 +1,3 @@
 module Devinstall
-  VERSION = "0.2.0" # first test
+  VERSION = "0.2.1" # first test
 end

data/lib/devinstall.rb

@@ -8,7 +8,6 @@ require 'pp'
 
 module Devinstall
 
-
   class Pkg
 
     # @param [Symbol] type
@@ -34,20 +33,16 @@ module Devinstall
                              chg: "#{pname}_amd64.changes"}
     end
 
-    def upload (env)
-      unless Settings.repos[:environments][env]
-        puts "Undefined environment '#{env}'"
-        exit! 1
-      end
+    def upload (environment)
       scp =Settings.base[:scp]
       repo =Hash.new
-      type =Settings.repos[:environments][env][:type].to_sym
+      type =Settings.repos[:environments][environment][:type]
       [:user, :host, :folder].each do |k|
-        fail("Unexistent key repos:#{env}:#{k}") unless Settings.repos[:environments][env].has_key?(k)
-        repo[k]=Settings.repos[:environments][env][k]
+        fail("Unexistent key repos:#{environment}:#{k}") unless Settings.repos[:environments][environment].has_key?(k)
+        repo[k]=Settings.repos[:environments][environment][k]
       end
-      @package_files[type].each do |t,p|
-        puts "Uploading target #{t}(#{p}) to #{repo[:user]}@#{repo[:host]}:#{repo[:folder]}"
+      build(type)
+      @package_files[type].each do |p|
         system("#{scp} #{Settings.local[:temp]}/#{p} #{repo[:user]}@#{repo[:host]}:#{repo[:folder]}")
       end
     end
@@ -56,9 +51,9 @@ module Devinstall
     def build (type)
       puts "Building package #{@package} type #{type.to_s}"
       unless Settings.packages[@package].has_key?(type)
-        puts("Package '#{@package}' cannot be built for the required env")
+        puts("Package '#{@package}' cannot be built for the required environment")
         puts("undefined build configuration for '#{type.to_s}'")
-        exit! 1
+        exit!(1)
       end
       build =Hash.new
       [:user, :host, :folder, :target].each do |k|
@@ -80,41 +75,75 @@ module Devinstall
           gsub('%p', @package.to_s).
           gsub('%T', type.to_s)
 
-      system("#{rsync} -az #{local_folder}/ #{build[:user]}@#{build[:host]}:#{build[:folder]}")
+      upload_sources("#{local_folder}/", "#{build[:user]}@#{build[:host]}:#{build[:folder]}")
       system("#{ssh} #{build[:user]}@#{build[:host]} \"#{build_command}\"")
-      @package_files[type].each do |p,t|
-        puts "Receiving target #{p.to_s}(#{t.to_s}) from #{build[:user]}@#{build[:host]}:#{build[:target]}"
+      @package_files[type].each do |p, t|
+        puts "Receiving target #{p.to_s} for #{t.to_s}"
         system("#{rsync} -az #{build[:user]}@#{build[:host]}:#{build[:target]}/#{t} #{local_temp}")
       end
     end
 
-    def install (env)
-      unless Settings.repos[:environments][env]
-        puts "Undefined environment '#{env}'"
+    def run_tests(environment)
+      # for tests we will use aprox the same setup as for build
+      test =Hash.new
+      [:user, :machine, :command, :folder].each do |k|
+        unless Settings.tests[environment].has_key?(k)
+          puts("Undefined key 'tests:#{environment}:#{k.to_s}:'")
+          exit!(1)
+        end
+        test[k]=Settings.tests[environment][k]
+      end
+      ssh =Settings.base[:ssh]
+
+      test[:command] = test[:command].gsub('%f', test[:folder]).
+          gsub('%t', Settings.build[:target]).
+          gsub('%p', @package.to_s)
+
+      local_folder =File.expand_path Settings.local[:folder] #take the sources from the local folder
+
+      upload_sources("#{local_folder}/", "#{test[:user]}@#{test[:machine]}:#{test[:folder]}") # upload them to the test machine
+
+      puts "Running all tests for the #{environment} environment"
+      puts "This will take some time"
+      ret=system("#{ssh} #{test[:user]}@#{test[:machine]} \"#{test[:command]}\"")
+      if ret
+        puts "Errors during test. Aborting current procedure"
         exit! 1
       end
-      puts "Installing #{@package} in #{env} environment."
+    rescue Exception => ee
+      puts "Unknown exception during parsing config file"
+      puts "Aborting (#{ee})"
+      exit! 1
+    end
+
+    def install (environment)
+      puts "Installing #{@package} in #{environment} environment."
       sudo =Settings.base[:sudo]
       scp =Settings.base[:scp]
-      type=Settings.install[:environments][env][:type].to_sym
+      type=Settings.install[:environments][environment][:type].to_sym
       local_temp =Settings.local[:temp]
       install=Hash.new
       [:user, :host, :folder].each do |k|
-        unless Settings.install[:environments][env].has_key? k
-          puts "Undefined key 'install:environments:#{env.to_s}:#{k.to_s}'"
-          exit!(1)
+        unless Settings.install[:environments][environment].has_key?(k)
+          puts "Undefined key 'install:#{environment.to_s}:#{k.to_s}'"
+          exit! 1
         end
-        install[k]=Settings.install[:environments][env][k]
+        install[k]=Settings.install[:environments][environment][k]
       end
       case type
         when :deb
-          system("#{scp} #{local_temp}/#{@package_files[type][:deb]} #{install[:user]}@#{install[:host]}/#{install[:folder]}")
+          system("#{scp} #{local_temp}/#{@package_files[type][:deb]} #{install[:user]}@#{install[:host]}:#{install[:folder]}")
           system("#{sudo} #{Settings.build[:user]}@#{Settings.build[:host]} \"dpkg -i #{install[:folder]}/#{@package_files[type][:deb]}\"")
         else
           puts "unknown package type '#{type.to_s}'"
-          exit!(1)
+          exit! 1
       end
     end
+
+    def upload_sources (source, dest)
+      rsync =Settings.base[:rsync]
+      system("#{rsync} -az #{source} #{dest}")
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devinstall
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dragos Boca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler