devinstall 0.2.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 814187f402502bc1f4530dbe4c2a8b9ec8c24190
-  data.tar.gz: 9818041552ee6e73fbda4ed3e778e458472996e4
+  metadata.gz: a72a20aa430bcf037ca21512a32d6e143087f0f8
+  data.tar.gz: 5db3417f1ebd025f01da2c84dd9766050b29f9f2
 SHA512:
-  metadata.gz: ad7dded5934b11adfb7715bb3c0cc0d97e4c758a509ff4f8b54d43b034641a356e796ea88219264882f3a8e59dd32ae9111234a7a6aa182e9aa29e81254399a3
-  data.tar.gz: 3468b12ee4269d3dd87ac3de83123b0d20b0403376e4a59a96dccdb098261e65d090521605c7b2713d2b8242f2667ac4cb47fa97c58a37016bab750daf35bf05
+  metadata.gz: 705c0e2eac77b70d570246ea152a64be626a58a8f9762fb2367af6f49ca4bf55b9b23c6fb3c0f5837be82ddb1f8d26b2bc26bc2d7c9534a4427ea9d4dbdedf94
+  data.tar.gz: 7ff04e301b68ce8ca10615f98d647a150d8977bd95c61a15db0c28a9fa5bc2f3eed0b5ca2face0b84eaca1d090099887ebde781615d7dab25cb6fd7ae14b73fd

data/README.md

@@ -24,29 +24,56 @@ Or install it yourself as:
 
 ## Usage
 
-Example command:
+When you install the gem, the installer automaticaly install a program named pkg-tool. 
+All the actions can be done via this tool.
 
-    $ devinstall –config ./config.yml --environment dev --package ui-lbgenerate --action install
+The general command line syntax is:
 
-This will build and install the package on dev environment
+	$ pkg_tool <action> [<package>] [--env <environment>] [--type <type>] [--config <config_file>]
 
-or
+Where:
+
+### Action can be one of the:
+
+    build
+
+Builds the package on the `build/env/host` and copy the package file(s) back in the `base/temp` folder
+
+    install
+
+Build (using `build` command) and install the builded package on the `install/env/host`
+
+    tests
+
+Run the tests described in `test` section of the configuration file
 
-    $ devinstall --config ./config.yml --environment dev-rh --package ui-lbgenerate --action upload
+    upload
 
-This will build and upload package to repository for dev-rh environment as defined in config.yml
+Build the package, run the tests and upload thr file to the repo
 
-The command line parameters are:
+### The switches
 
-	--config: the config file (defaults to ./config.yml)
+The command line switches are:
 
-	--environment: the environment for the install or upload action
+  --config: the config file (defaults to ./devinstall.yml)
 
-	-- package: the package to be built and installed/uploaded
+  --env: the environment for the install or upload action
+
+  --type: only for –action build and specifies the package type (deb, rpm, tar.gz, arc....)
+
+The switches override the defaults in the config file
+
+## Example command:
+
+    $ pkg-tool install devinstall –config ./config.yml --env dev
+
+This will build and install the package "devinstall" on dev environment
+
+or
 
-	--type: only for –action build and specifies the package type (deb, rpm, tar.gz, arc....)
+    $ pkg-tool upload devinstall --config ./config.yml --env dev-rh
 
-	--action: can be build (require also --type), install (require --environment) or upload (also require --environment)
+This will build and upload package "devinstall" to repository for dev-rh environment as defined in config.yml
 
 ## Contributing
 

data/bin/pkg-tool

@@ -1,11 +1,29 @@
 #!/usr/bin/env ruby
-
+require 'rubygems'
+require 'bundler/setup'
 require 'devinstall/cli'
 
+unless ARGV[0]
+  puts "You must specify an action"
+  exit! ""
+end
+
+package = [] # creata a new Array
 command = ARGV.shift
-package = ''
 
-unless %w"build install upload help version test".include? command
+while ARGV[0] and ARGV[0][0..1] != '--'
+  package << ARGV.shift
+end
+
+if %w"version --version -v".include? command
+  command = 'version'
+end
+
+if %w"help --help -h".include? command
+  command = 'help'
+end
+
+unless %w"build install upload test help version".include? command
   puts "Unknown command #{command}"
   exit! 1
 end
@@ -13,10 +31,6 @@ end
 ## the next should be the package
 # so if ARGV[0] don't start with --
 # we name it package
-if ARGV[0][0..1] != '--'
-  package = ARGV.shift
-end
-
-cli=Devinstall::Cli.new(package)
+cli=Devinstall::Cli.new(*package) ## Cli can be called for multiple packages
 cli.send(command.to_sym)
 

data/doc/example.yml

@@ -2,12 +2,23 @@ base:
   rsync: /usr/bin/rsync
   ssh: /usr/bin/ssh
   scp: /usr/bin/scp
-  sudo: /usr/bin/sshsudo
+  sudo: sshsudo
+defaults:
+  package: devinstall
+  env: dev
+  type: deb
+tests:
+# dev is the environment
+  dev: 
+    machine: dboca.dev.local
+    folder: rs
+    user: dboca
+    command: "cd %f && make devtest"
 local:
 # folder - source folder
 # temp - temporary folder
-  folder: ~/work/project
-  temp: ~/tmp
+  folder: ~/projects/devinstall
+  temp: ~/.tmp
 build:
 # host - build machine
 # folder - rsync to?
@@ -15,7 +26,7 @@ build:
 # user - for ssh / rsync
 # arch is the architecture for the generated package (like amd64 or i686)
   user: dboca
-  host: vm.development.lan
+  host: vm-dboca.dev.local
   folder: rs
   target: rs
   arch: all
@@ -23,33 +34,25 @@ install:
 # host - dev/prod deploy and install host
 # user - for scp / ssh / rsync  (defaults to base[user])
 # environment - live/qa/dev/...
-  user: dboca
-  environments:
-    dev:
-      host: dev01.server.lan
-      type: deb
-      folder: ~ ## folder for scp
-      user: dboca1
-      arch: all
-    prod:
-      host: prod01.server.lan
-      type: rpm
-      arch: all
-      # user defaults to install[:user]
+  dev:
+    user: dboca
+    host:
+      - server1.lan
+      - server2.lan
+    folder: /home/dboca ## folder for scp/dpkg -i
+    type: deb
+    arch: all
 repos:
 # for repository deployment
 # in a repository should be all packages for all architectures so we don't have an 'arch:' field
-   environments:
-     dev:
-       type: deb
-       user: upload
-       host: debian-repo01.server.lan
-       folder: /srv/repo
-     dev-rh:
-       type: rpm
+  dev:
+    user: dboca
+    host: dboca.repo.lan
+    folder: /srv/repo/incoming
+    type: deb
 packages:
-  ui-lbgenerate:
-# might contain all the sections above (local, build, install, repodeploy)
+  devinstall:
+# might contain all the sections above (local, build, install, repos)
 # type and build_command are mandatory
 # in build_command the folowing expansions are made:
 #  %f build[folder]
@@ -57,7 +60,6 @@ packages:
 #  %p package (current package)
 #  %T type (deb, rpm, tar.gz ,...)
     deb:
-      build_command: "cd %f && dpkg-buildpackage"
-  ui-lbcli:
-    deb:
-      build_command: "cd %f && dpkg-buildpackage"
+      build:
+        command: "cd %f/%p && dpkg-buildpackage"
+

data/lib/devinstall/cli.rb

@@ -3,9 +3,8 @@ require 'getopt/long'
 require 'devinstall/settings'
 module Devinstall
   class Cli
-    # extend self
-    # make this module a singleton also
-    # See why
+
+    include Utils
 
     def get_config(fnames)
       fnames.each do |f|
@@ -14,78 +13,95 @@ module Devinstall
       @opt['config']
     end
 
-    def initialize(package)
+    def initialize(*package)
       begin
         @opt = Getopt::Long.getopts(
-            ['--package', '-p', Getopt::REQUIRED],
             ['--config', '-c', Getopt::REQUIRED],
             ['--type', '-t', Getopt::REQUIRED],
-                                    ['--env','-e', Getopt::REQUIRED],
-                                    ['--verbose', '-v'],
-                                    ['--dry-run', '-d'],
+            ['--env', '-e', Getopt::REQUIRED],
+            ['--verbose', '-v'],
+            ['--dry-run', '-d'],
         )
       rescue
-        puts 'Invalid option in command line'
+        puts 'Invalid option at command line'
         help
-        exit! 1
       end
       #verbose and dry-run
       $verbose ||= @opt['verbose']
-      $dry     ||= @opt['dry-run']
+      $dry ||= @opt['dry-run']
       # 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
-      if package != '' # a packege was supplied on commandline
-        @opt['package'] = package # this overrides all
+      get_config(["./devinstall.yml", "~/.devinstall.yml"])
+      # add packages
+      @opt['package']=[] # reset the package array because commandline have priority
+      if package # a package was supplied on command line
+        package.each { |p| @opt['package'] << p } # now this overrides everything
       end
-      %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
+      #get default packages
+      if @opt['package'].empty?
+        config = Devinstall::Settings.new(@opt['config'], nil, @opt['env'], @opt['type']) # Just for pkg :D
+        @opt['package'] = config.pkg # we DO have accessor
       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)
+      if @opt['config'].empty?
+        exit! 'You must specify the config file'
+      end
+      # create package
+      @opt['package'].each do |package|
+        pk=Devinstall::Pkg.new(Devinstall::Settings.new(@opt['config'], package, @opt['env'], @opt['type']))
+        pk.build
+      end
     end
 
     def install
-      @package.build(@opt['type'].to_sym)
-      @package.install(@opt['env'].to_sym)
+      if @opt['config'].empty?
+        exit! 'You must specify the config file'
+      end
+      @opt['package'].each do |package|
+        pk=Devinstall::Pkg.new(Devinstall::Settings.new(@opt['config'], package, @opt['env'], @opt['type']))
+        pk.build
+        pk.install
+      end
     end
 
     def upload
-      @package.build(@opt['type'].to_sym)
-      @package.run_tests(@opt['env'].to_sym)
-      @package.upload(@opt['env'].to_sym)
+      if @opt['config'].empty?
+        exit! 'You must specify the config file'
+      end
+      @opt['package'].each do |package|
+        config=Devinstall::Settings.new(@opt['config'], package, @opt['env'], @opt['type'])
+        pk=Devinstall::Pkg.new(config)
+        pk.build
+        pk.run_tests
+        pk.upload
+      end
     end
 
     def test
-      @package.run_tests(@opt['env'].to_sym)
+      if @opt['config'].empty?
+        exit! 'You must specify the config file'
+      end
+      @opt['package'].each do |package|
+        config=Devinstall::Settings.new(@opt['config'], package, @opt['env'], @opt['type'])
+        pk=Devinstall::Pkg.new(config)
+        pk.run_tests
+      end
+    end
+
+    def help
+      puts 'Usage:'
+      puts 'pkg-tool command [package_name ... ] --config|-c <file>  --type|-t <package_type> --env|-e <environment>'
+      puts 'where command is one of the: build, install, upload, help, version'
+      exit! ""
+    end
+
+    def version
+      puts "devinstall version #{Devinstall::VERSION}"
+      puts "pkg-tool version   #{Devinstall::VERSION}"
+      exit! ""
     end
 
   end
 end
+

data/lib/devinstall/settings.rb

@@ -4,62 +4,127 @@ class Hash
   include DeepSymbolizable
 end
 
+module Devinstall
+
+  class KeyNotDefinedError < RuntimeError; end
+
+  class UnknownKeyError < RuntimeError; end
+
+  class Settings
+    include Utils
+    attr_accessor :pkg, :env, :type
+
+    def initialize (filename, pkg = nil, env = nil, type = nil)
+      @@_files ||= []
+      @@_settings ||= {}
+      load! filename
+      self.pkg = pkg ? pkg : defaults(:package)
+      self.env = env ? env.to_sym : defaults(:env).to_sym
+      self.type = type ? type.to_sym : defaults(:type).to_sym
+      if Array === self.pkg
+        self.pkg.each do |p|
+          raise KeyNotDefinedError, "Package '#{p}' not defined"               unless @@_settings[:packages].has_key? p.to_sym
+          raise KeyNotDefinedError, "Package #{p} type '#{type}' not defined " unless @@_settings[:packages][p.to_sym].has_key? self.type
+        end
+      else
+        raise KeyNotDefinedError, "Package '#{p}' not defined"               unless @@_settings[:packages].has_key? self.pkg.to_sym
+        raise KeyNotDefinedError, "Package #{p} type '#{type}' not defined " unless @@_settings[:packages][self.pkg.to_sym].has_key? self.type
+      end
+      raise KeyNotDefinedError, "Missing package" unless self.pkg
+      raise KeyNotDefinedError, "Missing environment" unless self.env
+      raise KeyNotDefinedError, "Missing package type" unless self.type
+    rescue KeyNotDefinedError => e
+      puts "#{e.message}"
+      exit! "" #here should be raise
+    rescue UnknownKeyError => e
+      puts "Program error: #{e.message} at:"
+      puts e.backtrace
+      exit!
+    end
 
-module Settings
-
-  extend self
-
-  @_settings = {}
-  attr_reader :_settings
+    def load!(filename) # Multiple load -> merge settings
+      unless File.exist?(filename)
+        puts "Unable to find config file \"#{filename}\""
+        exit!
+      end
+      unless @@_files.include? filename
+        @@_files << filename
+        newsets = YAML::load_file(filename).deep_symbolize
+        deep_merge!(@@_settings, newsets)
+      end
+    end
 
-  def load!(filename, options = {})
-    unless File.exist?(filename)
-      puts "Unable to find config file \"#{filename}\""
-      exit!(1)
+    def deep_merge!(target, data)
+      merger = proc do |_, v1, v2|
+        Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2
+      end
+      target.merge! data, &merger
     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
 
-  def deep_merge!(target, data)
-    merger = proc do |_, v1, v2|
-      Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2
+    def defaults(key=nil)
+      return @@_settings.has_key? :defaults if key.nil?
+      raise UnknownKeyError, "Don't know what are you asking about: '#{key}'" unless [:package, :type, :env].include? key
+      @@_settings[:defaults][key] or raise KeyNotDefinedError, "Undefined key :default:#{key.to_s}"
     end
-    target.merge! data, &merger
-  end
 
-  def defaults
-    @_settings[:defaults]
-  end
+    def base(key=nil)
+      return @@_settings.has_key? :base if key.nil?
+      raise UnknownKeyError, "Don't know what are you asking about: '#{key}'" unless [:rsync, :ssh, :sudo, :scp].include? key
+      @@_settings[:base][key] or raise KeyNotDefinedError, "Undefined key :base:#{key.to_s}"
+    end
 
-  def tests
-    @_settings[:tests]
-  end
+    def local(key)
+      raise UnknownKeyError, "Don't know what are you asking about: '#{key}'" unless [:folder, :temp].include? key
+      ret=@@_settings[:local][key]
+      if @@_settings[:packages][self.pkg.to_sym][self.type].has_key? :local
+        ret = @@_settings[:packages][self.pgk.to_sym][self.type][:local][key] || ret
+      end
+      ret or raise KeyNotDefinedError, "Undefined key :local:#{key} or :#{self.pkg}:local:#{key}"
+    end
 
-  def base
-    @_settings[:base]
-  end
+    def build(key)
+      raise UnknownKeyError, "Don't know what are you asking about: '#{key}'" unless [:user, :host, :folder, :target, :arch, :command].include? key
+      ret=@@_settings[:build][key]
+      if @@_settings[:packages][self.pkg.to_sym][self.type].has_key? :build
+        ret = @@_settings[:packages][self.pkg.to_sym][self.type][:build][key] || ret
+      end
+      ret or raise KeyNotDefinedError, "Undefined key :build:#{key} or :#{self.pkg}:#{self.type}:build:#{key}"
+    end
 
-  def local
-    @_settings[:local]
-  end
+    def install(key)
+      raise UnknownKeyError, "Don't know what are you asking about: '#{key}'" unless [:user, :host, :folder, :type, :arch].include? key
+      ret=@@_settings[:install][self.env][key]
+      if @@_settings[:packages][self.pkg.to_sym][self.type].has_key? :install and @@_settings[:packages][:install].has_key? self.env
+        ret = @@_settings[:packages][self.pgk.to_sym][self.type][:install][self.env][key] || ret
+      end
+      ret or raise KeyNotDefinedError, "Undefined key :install:#{self.env.to_s}:#{key} or :#{self.pkg}:install:#{self.env.to_s}:#{key}"
+    end
 
-  def build
-    @_settings[:build]
-  end
+    def tests(key=nil) # tests don't have 'env'
+      return @@_settings.has_key?(:tests) if key.nil?
+      raise UnknownKeyError, "Don't know what are you asking about: '#{key}'" unless [:machine, :folder, :user, :command].include? key
+      ret=@@_settings[:tests][key]
+      if @@_settings[:packages][self.pkg.to_sym][self.type].has_key? :tests
+        ret = @@_settings[:packages][self.pkg.to_sym][self.type][:tests][key] || ret
+      end
+      ret or raise KeyNotDefinedError, "Undefined key :tests:#{self.env.to_s}:#{key} or :#{self.pkg}:tests:#{self.env.to_s}:#{key}"
+    end
 
-  def install
-    @_settings[:install]
-  end
+    def repos(key)
+      raise UnknownKeyError, "Don't know what are you asking about: '#{key}'" unless [:user, :host, :folder, :type, :arch].include? key
+      ret=@@_settings[:repos][self.env][key]
+      if @@_settings[:packages][self.pkg.to_sym][self.type].has_key? :repos and @@_settings[:packages][:repos].has_key? self.env
+        ret = @@_settings[:packages][self.pkg.to_sym][self.type][:repos][self.env][key] || ret
+      end
+      ret or raise KeyNotDefinedError, "Undefined key :repos:environments:#{self.env.to_s}:#{key} or :#{self.pkg}:repos:#{self.env.to_s}:#{key}"
+    end
 
-  def repos
-    @_settings[:repos]
-  end
+    %w(repos packages).each do |m|
+      define_method(m) do
+        @@_settings[m.to_sym]
+      end
+    end
 
-  def packages
-    @_settings[:packages]
   end
-
 end
 

data/lib/devinstall/utils.rb

@@ -8,16 +8,22 @@ module Utils
       if $?.exitstatus != 0 ## return failure
         puts "While executing:"
         puts cmd
-        puts "The command failed with exitstatus $?.exitstatus"
+        puts "The command failed with exitstatus #{$?.exitstatus}"
         puts "Full output of command follows"
         puts "="*40
         puts ret
+        puts "="*40
         puts "Nothing to do. Aborting!"
-        exit! 1
+        exit! "Done"
       end
     end
     ret
   end
 
+  def exit! msg
+    puts msg || "Aborting!"
+    Kernel.exit 1
+  end
+
 
 end #module

data/lib/devinstall/version.rb

@@ -1,3 +1,3 @@
 module Devinstall
-  VERSION = '0.2.6' # Small bugfixes
+  VERSION = '1.0.0' # Working!
 end

data/lib/devinstall.rb

@@ -1,10 +1,7 @@
 require 'devinstall/version'
 require 'devinstall/deep_symbolize'
 require 'devinstall/utils'
-require 'devinstall/settings' ##  in near future we will have to abandon Settings
-                              # for something more complex because we will need to
-                              # define things (repos/install-hosts) for different
-                              # environments (dev/qa/prelive/live/prod/backup and so)
+require 'devinstall/settings'
 require 'pp'
 
 module Devinstall
@@ -13,85 +10,71 @@ module Devinstall
 
     include Utils
 
-    # @param [Symbol] type
-    def get_version(type)
-      if type == :deb
-        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
+    def get_version
+      case @config.type
+        when :deb
+          begin
+            deb_changelog = File.expand_path "#{@config.local(:folder)}/#{@package}/debian/changelog" # This is the folder that should be checked
+            unless File.exists? deb_changelog
+              exit! <<-eos
+                No 'debian/changelog' found in specified :local:folder (#{@config.local(:folder)})
+                Please check your config file
+              eos
+            end
+            @_package_version[:deb] = File.open(deb_changelog, 'r') { |f| f.gets.chomp.sub(/^.*\((.*)\).*$/, '\1') }
+          rescue IOError => e
+            exit! <<-eos
+              IO Error while opening #{deb_changelog}
+              Aborting \n #{e}
+            eos
+          end
       end
     end
 
     # @param [String] package
-    def initialize (package)
-      # curently implemented only for .deb packages (for .rpm later :D)
-      unless Settings.packages.has_key? package.to_sym
-        puts "You required an undefined package #{package}"
-        puts "Aborting!"
-        exit! 1
-      end
-      @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"}
+    # @param [String] config
+    def initialize (config)
+      @config=config #class variable,first thing!
+      # currently implemented only for .deb packages (for .rpm later :D)
+      @package = @config.pkg.to_sym 
+      @_package_version = {} # versions for types:
+      @package_files = {}
+      arch = @config.build(:arch)
+      p_name = "#{@package}_#{get_version}"
+      @package_files[:deb] = {deb: "#{p_name}_#{arch}.deb",
+                              tgz: "#{p_name}.tar.gz",
+                              dsc: "#{p_name}.dsc",
+                              chg: "#{p_name}_amd64.changes"}
     end
 
-    def upload (env)
-      scp = Settings.base[:scp]
+    def upload
+      scp = @config.base(:scp)
       repo = {}
-      type = Settings.repos[:environments][env][:type].to_sym
-      [:user, :host, :folder].each do |k|
-        unless Settings.repos[:environments][env].has_key?(k)
-          puts "Unexistent key #{k} in repos:environments:#{env}"
-          puts "Aborting"
-          exit! 1
-        end
-        repo[k] = Settings.repos[:environments][env][k]
+      [:user, :host, :folder, :type].each do |k|
+        repo[k] = @config.repos(k) # looks stupid 
       end
-      @package_files[type].each do |p,f|
+      @package_files[type].each do |p, f|
         puts "Uploading #{f}\t\t[#{p}] to $#{repo[:host]}"
-        command("#{scp} #{Settings.local[:temp]}/#{f} #{repo[:user]}@#{repo[:host]}:#{repo[:folder]}")
+        command("#{scp} #{@config.local(:temp)}/#{f} #{repo[:user]}@#{repo[:host]}:#{repo[:folder]}")
       end
     end
 
-    # @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
-      end
+    def build
+      type = @config.type
+      puts "Building package #{@package} type #{type}"
       build = {}
       [:user, :host, :folder, :target].each do |k|
-        unless Settings.build.has_key? k
-          puts "Undefined key 'build:#{k.to_s}:'"
-          puts "Aborting!"
-          exit! 1
-        end
-        build[k] = Settings.build[k]
+        build[k] = @config.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 = @config.base(:ssh)
+      build_command = @config.build(:command)
+      rsync = @config.base(:rsync)
+      local_folder = File.expand_path @config.local(:folder)
+      local_temp = File.expand_path @config.local(:temp)
 
       build_command = build_command.gsub('%f', build[:folder]).
-          gsub('%t', Settings.build[:target]).
+          gsub('%t', @config.build(:target)).
           gsub('%p', @package.to_s).
           gsub('%T', type.to_s)
 
@@ -103,69 +86,61 @@ module Devinstall
       end
     end
 
-    def run_tests(env)
-      # for tests we will use aprox the same setup as for build
-      test = {}
-      [:user, :machine, :command, :folder].each do |k|
-        unless Settings.tests[env].has_key? k
-          puts("Undefined key 'tests:#{env}:#{k.to_s}:'")
-          exit! 1
-        end
-        test[k] = Settings.tests[env][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 #{env} environment"
-      puts "This will take some time and you have no output"
-      command("#{ssh} #{test[:user]}@#{test[:machine]} \"#{test[:command]}\"")
-    rescue => ee
-      puts "Unknown exception during parsing config file"
-      puts "Aborting (#{ee})"
-      exit! 1
-    end
-
-    def install (environment)
-      puts "Installing #{@package} in #{environment} environment."
-      local_temp = Settings.local[:temp]
-      sudo = Settings.base[:sudo]
-      scp = Settings.base[:scp]
-      type = Settings.install[:environments][environment][:type].to_sym
+    def install
+      env = @config.env
+      puts "Installing #{@package} in #{env} environment."
+      local_temp = @config.local(:temp)
+      sudo = @config.base(:sudo)
+      scp = @config.base(:scp)
+      type = @config.type
       install = {}
       [:user, :host, :folder].each do |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] = @config.install(k)
       end
-
       install[:host] = [install[:host]] unless Array === install[:host]
-
       case type
-      when :deb
-        install[:host].each do |host|
-          command("#{scp} #{local_temp}/#{@package_files[type][:deb]} #{install[:user]}@#{host}:#{install[:folder]}")
-          command("#{sudo} #{install[:user]}@#{host} /usr/bin/dpkg -i #{install[:folder]}/#{@package_files[type][:deb]}")
-        end
-      else
-        puts "unknown package type '#{type.to_s}'"
-        exit! 1
+        when :deb
+          install[:host].each do |host|
+            command("#{scp} #{local_temp}/#{@package_files[type][:deb]} #{install[:user]}@#{host}:#{install[:folder]}")
+            command("#{sudo} #{install[:user]}@#{host} /usr/bin/dpkg -i #{install[:folder]}/#{@package_files[type][:deb]}")
+          end
+        else
+          exit! "unknown package type '#{type.to_s}'"
+      end
+    end
+
+    def run_tests
+      # check if we have the test section in the configuration file
+      unless @config.tests
+        puts "No test section in the config file."
+        puts "Skipping tests"
+        return;
       end
+      # for tests we will use almost the same setup as for build
+      test = {}
+      [:user, :machine, :command, :folder].each do |k|
+        test[k] = @config.(k)
+      end
+      ssh = @config.base(:ssh)
+      # replace "variables" in commands
+      test[:command] = test[:command].
+        gsub('%f', test[:folder]). # %f is the folder where the sources are rsync-ed
+        gsub('%t', @config.build(:target)). # %t is the folder where the build places the result
+        gsub('%p', @package.to_s) # %p is the package name
+      # take the sources from the local folder
+      local_folder = File.expand_path @config.local(:folder)
+      # upload them to the test machine
+      upload_sources("#{local_folder}/", "#{test[:user]}@#{test[:machine]}:#{test[:folder]}")
+      puts "Running all tests"
+      puts 'This will take some time and you have no output'
+      command("#{ssh} #{test[:user]}@#{test[:machine]} \"#{test[:command]}\"")
     end
 
     def upload_sources (source, dest)
-      rsync = Settings.base[:rsync]
+      rsync = @config.base(:rsync)
       command("#{rsync} -az #{source} #{dest}")
     end
   end
-end
 
+end
 

metadata

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