devinstall 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddb84669dfb3c1db3216c80b3412a4e176c94e52
-  data.tar.gz: 0bb1e0dfc0ff1f3ee55d2e39a387574d31f9e9ff
+  metadata.gz: 51f4ddcf8ee4cb1806c0ee407aa1c6e582c7088c
+  data.tar.gz: 7317bd32282391c568339f534e23bd485bbf02b4
 SHA512:
-  metadata.gz: a5b8578a2533246bf0da8caccbab886833b22f4b930bc0031e63653308a279239f456ab428726f9852c53035fe6c353cc436eda9b54e17adca795caf874f49f7
-  data.tar.gz: 6152d2324a9fbe68d01adf94e297997df271d6f9d282dfdfae59a0a968f8d1ab7c00acda918b40be8f941a06b6b64888f59a23f3e5d58e031905d0a2d1efd588
+  metadata.gz: 8ac955e8f47abcfcf93f2ad3351ef78125d8d7e68b898ff4ff5812473fcf2fd3c159a35d4e576d04336b54630c52166b92efe7904fc9855f3884869753756b06
+  data.tar.gz: ae05a8d213cf8570eeb9c7a4016de3dbe31f39da88e1db182d6a187b339e81c8cb4699577983ea3c77348adef9944a35ef5a2d8018764c0a5861a3b7b7182b06

data/bin/pkg-tool

@@ -1,69 +1,12 @@
 #!/usr/bin/env ruby
 
-require 'getopt/long'
-require 'devinstall'
-require 'devinstall/settings'
+require 'devinstall/cli'
 
-begin
-  opt =Getopt::Long.getopts(
-      ['--version', '-v',],
-      ['--package', '-p', Getopt::REQUIRED],
-      ['--config', '-c', Getopt::REQUIRED],
-      ['--type', '-t', Getopt::REQUIRED],
-      ['--env', '-e', Getopt::REQUIRED],
-      ['--build', '-b',],
-      ['--upload', '-u',],
-      ['--install', '-i',],
-      ['--test', '-t,'],
-      ['--help', '-h',],
-  )
-rescue
-  puts 'Invalid option in command line'
-  help!
-  exit! 1
-end
-
-def help!
-  puts 'Usage: pkg-install --config|-c <file> --package|-p <package> --type|-t <package_type> --env|-e <environment> --build|--upload|--install'
-end
-
-if opt['version']
-  puts "devinstall version #{Devinstall::VERSION}"
-  puts "pkg-tool version   #{Devinstall::VERSION}"
-  exit(0)
-end
-
-if opt['help']
-  help!
-  exit!(0)
-end
-unless opt['config']
-  puts 'You must specify the config file'
-  exit! 1 # Exit 
-end
-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
-
-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'])
+command = ARGV.shift
 
-if opt['build']
-  package.build(opt['type'].to_sym)
-elsif opt['install']
-  package.build(opt['type'].to_sym)
-  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)
+unless %w"build install upload help version test".include? command
+  puts "Unknown command #{command}"
+  exit 1
 end
+cli=Cli.new
+cli.send(command.to_sym)

data/lib/devinstall/cli.rb

@@ -0,0 +1,83 @@
+require 'devinstall'
+require 'getopt/long'
+require 'devinstall/settings'
+module Devinstall
+  class Cli
+    # extend self
+    # make this module a singleton also
+    # See why
+
+    def get_config(fnames)
+      fnames.each do |f|
+        (@opt['config'] ||= (File.expand_path(f) if File.exist? f)) and break
+      end
+      @opt['config']
+    end
+
+    def initialize
+      begin
+        @opt = Getopt::Long.getopts(
+            ['--package', '-p', Getopt::REQUIRED],
+            ['--config', '-c', Getopt::REQUIRED],
+            ['--type', '-t', Getopt::REQUIRED],
+            ['--env', '-e', Getopt::REQUIRED],
+        )
+      rescue
+        puts 'Invalid option in command line'
+        help
+        exit! 1
+      end
+      # get config file
+      unless get_config(["./devinstall.yml"])
+        puts 'You must specify the config file'
+        exit! 1 # Exit
+      end
+      # parse config file
+      Settings.load!(@opt['config'])
+      # complete from default values
+      %w"package env type".each { |o| @opt[o] ||= Settings.defaults[o.to_sym] if Settings.defaults[o.to_sym] }
+      # verify all informations
+      %w"package type env".each do |k|
+        unless @opt[k]
+          puts "You must specify option '#{k}' either as default or in command line"
+          help
+        end
+      end
+      # create package
+      @package=Devinstall::Pkg.new(@opt['package'])
+    end
+
+    def version
+      puts "devinstall version #{Devinstall::VERSION}"
+      puts "pkg-tool version   #{Devinstall::VERSION}"
+      exit(0)
+    end
+
+    def help
+      puts 'Usage:'
+      puts 'pkg-install command --config|-c <file> --package|-p <package> --type|-t <package_type> --env|-e <environment>'
+      puts 'where command is one of the: build, install, upload, help, version'
+      exit! 0
+    end
+
+    def build
+      @package.build(@opt['type'].to_sym)
+    end
+
+    def install
+      package.build(@opt['type'].to_sym)
+      package.install(@opt['env'].to_sym)
+    end
+
+    def upload
+      package.build(@opt['type'].to_sym)
+      package.run_tests(@opt['env'].to_sym)
+      package.upload(@opt['env'].to_sym)
+    end
+
+    def test
+      package.run_tests(@opt['env'].to_sym)
+    end
+
+  end
+end

data/lib/devinstall/deep_symbolize.rb

@@ -1,17 +1,3 @@
-# Symbolizes all of hash's keys and subkeys.
-# Also allows for custom pre-processing of keys (e.g. downcasing, etc)
-# if the block is given:
-#
-# somehash.deep_symbolize { |key| key.downcase }
-#
-# Usage: either include it into global Hash class to make it available to
-# to all hashes, or extend only your own hash objects with this
-# module.
-# E.g.:
-# 1) class Hash; include DeepSymbolizable; end
-# 2) myhash.extend DeepSymbolizable
-
-
 module DeepSymbolizable
 
   def deep_symbolize(&block)
@@ -23,35 +9,22 @@ module DeepSymbolizable
   module Symbolizers
     extend self
 
-    # the primary method - symbolizes keys of the given hash,
-    # preprocessing them with a block if one was given, and recursively
-    # going into all nested enumerables
     def hash(hash, &block)
       hash.inject({}) do |result, (key, value)|
-        # Recursively deep-symbolize subhashes
         value = _recurse_(value, &block)
-
-        # Pre-process the key with a block if it was given
         key = yield key if block_given?
-        # Symbolize the key string if it responds to to_sym
         sym_key = key.to_sym rescue key
-
-        # write it back into the result and return the updated hash
         result[sym_key] = value
         result
       end
     end
 
-    # walking over arrays and symbolizing all nested elements
     def array(ary, &block)
       ary.map { |v| _recurse_(v, &block) }
     end
 
-    # handling recursion - any Enumerable elements (except String)
-    # is being extended with the module, and then symbolized
     def _recurse_(value, &block)
       if value.is_a?(Enumerable) && !value.is_a?(String)
-        # support for a use case without extended core Hash
         value.extend DeepSymbolizable unless value.class.include?(DeepSymbolizable)
         value = value.deep_symbolize(&block)
       end

data/lib/devinstall/settings.rb

@@ -23,8 +23,9 @@ module Settings
   end
 
   def deep_merge!(target, data)
-    merger = proc { |_, v1, v2|
-      Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+    merger = proc do |_, v1, v2|
+      Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2
+    end
     target.merge! data, &merger
   end
 

data/lib/devinstall/version.rb

@@ -1,3 +1,3 @@
 module Devinstall
-  VERSION = "0.2.2" # first test
+  VERSION = '0.2.3' # first test
 end

data/lib/devinstall.rb

@@ -13,35 +13,41 @@ module Devinstall
     # @param [Symbol] type
     def get_version(type)
       if type == :deb
-        deb_changelog = File.expand_path "#{Settings.local[:folder]}/#{@package}/debian/changelog" # This is the folder that should be checked
-        deb_package_version =File.open(deb_changelog, 'r').gets.chomp.sub(/^.*\((.*)\).*$/, '\1')
-        @_package_version[:deb]=deb_package_version
+        begin
+          deb_changelog = File.expand_path "#{Settings.local[:folder]}/#{@package}/debian/changelog" # This is the folder that should be checked
+          deb_package_version = File.open(deb_changelog, 'r') { |f| f.gets.chomp.sub(/^.*\((.*)\).*$/, '\1') }
+          @_package_version[:deb] = deb_package_version
+
+        rescue IOError => e
+          puts "IO Error while opening #{deb_changelog}"
+          puts "Aborting \n #{e}"
+          exit! 1
+        end
       end
     end
 
     # @param [String] package
     def initialize (package)
       # curently implemented only for .deb packages (for .rpm later :D)
-      @package =package.to_sym
-      @_package_version =Hash.new # versions for types:
-      @package_files =Hash.new
-      arch =Settings.build[:arch]
-      pname ="#{package}_#{get_version :deb}"
-      @package_files[:deb] ={deb: "#{pname}_#{arch}.deb",
-                             tgz: "#{pname}.tar.gz",
-                             dsc: "#{pname}.dsc",
-                             chg: "#{pname}_amd64.changes"}
+      @package = package.to_sym
+      @_package_version = Hash.new # versions for types:
+      @package_files = Hash.new
+      arch = Settings.build[:arch]
+      pname = "#{package}_#{get_version :deb}"
+      @package_files[:deb] = {deb: "#{pname}_#{arch}.deb",
+                              tgz: "#{pname}.tar.gz",
+                              dsc: "#{pname}.dsc",
+                              chg: "#{pname}_amd64.changes"}
     end
 
-    def upload (environment)
-      scp =Settings.base[:scp]
-      repo =Hash.new
-      type =Settings.repos[:environments][environment][:type]
+    def upload (env)
+      scp = Settings.base[:scp]
+      repo = {}
+      type = Settings.repos[:environments][env][:type]
       [:user, :host, :folder].each do |k|
-        fail("Unexistent key repos:#{environment}:#{k}") unless Settings.repos[:environments][environment].has_key?(k)
-        repo[k]=Settings.repos[:environments][environment][k]
+        fail("Unexistent key repos:#{environment}:#{k}") unless Settings.repos[:environments][env].has_key?(k)
+        repo[k] = Settings.repos[:environments][env][k]
       end
-      build(type)
       @package_files[type].each do |p|
         system("#{scp} #{Settings.local[:temp]}/#{p} #{repo[:user]}@#{repo[:host]}:#{repo[:folder]}")
       end
@@ -50,25 +56,25 @@ module Devinstall
     # @param [Symbol] type
     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 environment")
-        puts("undefined build configuration for '#{type.to_s}'")
-        exit!(1)
+      unless Settings.packages[@package].has_key? type
+        puts "Package '#{@package}' cannot be built for the required environment"
+        puts "undefined build configuration for '#{type.to_s}'"
+        exit! 1
       end
-      build =Hash.new
+      build = {}
       [:user, :host, :folder, :target].each do |k|
-        unless Settings.build.has_key?(k)
-          puts("Undefined key 'build:#{k.to_s}:'")
-          exit!(1)
+        unless Settings.build.has_key? k
+          puts "Undefined key 'build:#{k.to_s}:'"
+          exit! 1
         end
-        build[k]=Settings.build[k]
+        build[k] = Settings.build[k]
       end
 
-      ssh =Settings.base[:ssh]
-      build_command=Settings.packages[@package][type][:build_command]
-      rsync =Settings.base[:rsync]
-      local_folder =File.expand_path Settings.local[:folder]
-      local_temp =File.expand_path Settings.local[:temp]
+      ssh = Settings.base[:ssh]
+      build_command = Settings.packages[@package][type][:build_command]
+      rsync = Settings.base[:rsync]
+      local_folder = File.expand_path Settings.local[:folder]
+      local_temp = File.expand_path Settings.local[:temp]
 
       build_command = build_command.gsub('%f', build[:folder]).
           gsub('%t', Settings.build[:target]).
@@ -76,41 +82,51 @@ module Devinstall
           gsub('%T', type.to_s)
 
       upload_sources("#{local_folder}/", "#{build[:user]}@#{build[:host]}:#{build[:folder]}")
-      system("#{ssh} #{build[:user]}@#{build[:host]} \"#{build_command}\"")
+      res = system("#{ssh} #{build[:user]}@#{build[:host]} \"#{build_command}\"")
+      unless res
+        puts 'Build error'
+        puts 'Aborting!'
+        exit! 1
+      end
       @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}")
+        res = system("#{rsync} -az #{build[:user]}@#{build[:host]}:#{build[:target]}/#{t} #{local_temp}")
+        unless res
+          puts 'File downloading error'
+          puts 'Aborting!'
+          exit! 1
+        end
       end
     end
 
-    def run_tests(environment)
+    def run_tests(env)
       # for tests we will use aprox the same setup as for build
-      test =Hash.new
+      test = {}
       [:user, :machine, :command, :folder].each do |k|
-        unless Settings.tests[environment].has_key?(k)
+        unless Settings.tests[env].has_key? k
           puts("Undefined key 'tests:#{environment}:#{k.to_s}:'")
-          exit!(1)
+          exit! 1
         end
-        test[k]=Settings.tests[environment][k]
+        test[k] = Settings.tests[env][k]
       end
-      ssh =Settings.base[:ssh]
+      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
+      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]}\"")
+      ret = system("#{ssh} #{test[:user]}@#{test[:machine]} \"#{test[:command]}\"")
       if ret
         puts "Errors during test. Aborting current procedure"
         exit! 1
       end
-    rescue Exception => ee
+    rescue => ee
       puts "Unknown exception during parsing config file"
       puts "Aborting (#{ee})"
       exit! 1
@@ -118,17 +134,17 @@ module Devinstall
 
     def install (environment)
       puts "Installing #{@package} in #{environment} environment."
-      sudo =Settings.base[:sudo]
-      scp =Settings.base[:scp]
-      type=Settings.install[:environments][environment][:type].to_sym
-      local_temp =Settings.local[:temp]
-      install=Hash.new
+      local_temp = Settings.local[:temp]
+      sudo = Settings.base[:sudo]
+      scp = Settings.base[:scp]
+      type = Settings.install[:environments][environment][:type].to_sym
+      install = {}
       [:user, :host, :folder].each do |k|
-        unless Settings.install[:environments][environment].has_key?(k)
+        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][environment][k]
+        install[k] = Settings.install[:environments][environment][k]
       end
       case type
         when :deb
@@ -141,8 +157,14 @@ module Devinstall
     end
 
     def upload_sources (source, dest)
-      rsync =Settings.base[:rsync]
-      system("#{rsync} -az #{source} #{dest}")
+      rsync = Settings.base[:rsync]
+      res = system("#{rsync} -az #{source} #{dest}")
+      unless res
+        puts "Rsync error"
+        puts "Aborting!"
+        exit! 1
+      end
+      res
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devinstall
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Dragos Boca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,7 @@ files:
 - devinstall.gemspec
 - doc/example.yml
 - lib/devinstall.rb
+- lib/devinstall/cli.rb
 - lib/devinstall/deep_symbolize.rb
 - lib/devinstall/settings.rb
 - lib/devinstall/version.rb