devinstall 0.0.4 → 0.0.5

data/bin/pkg-tool

@@ -5,49 +5,51 @@ require 'devinstall'
 require 'devinstall/settings'
 
 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', ],
-    ['--help',    '-h', ],
-)
+  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',],
+      ['--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'
+  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']
-  puts 'Usage: pkg-install --config|-c <file> --package|-p <package> --type|-t <package_type> --env|-e <environment> --build|--upload|--install'
+  help!
   exit!(0)
 end
-if !( opt['package'] && opt['config'] && opt['type'] && opt['env'] && (opt['build'] || opt['upload'] || opt['install']))
+
+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
 Settings.load!(opt['config'])
 package=Pkg.new(opt['package'])
 
-if opt[:build]
+if opt['build']
   package.build!(opt['type'].to_sym)
-end
-
-if opt[:install]
+elsif opt['install']
   package.build!(opt['type'].to_sym)
   package.install!(opt['env'].to_sym)
-end
-
-if opt[:upload]
+elsif opt['upload']
   package.build!(opt['type'].to_sym)
   package.upload!(opt['env'].to_sym)
 end

data/doc/example.yml

@@ -13,10 +13,12 @@ build:
 # folder - rsync to?
 # target - the folder where packages will be generated (defaults to folder)
 # user - for ssh / rsync
+# arch is the architecture for the generated package (like amd64 or i686)
   user: dboca
   host: vm.development.lan
   folder: rs
   target: rs
+  arch: all
 install:
 # host - dev/prod deploy and install host
 # user - for scp / ssh / rsync  (defaults to base[user])
@@ -28,12 +30,15 @@ install:
       type: deb
       folder: ~ ## folder for scp
       user: dboca1
+      arch: all
     prod:
       host: prod01.server.lan
       type: rpm
+      arch: all
       # user defaults to install[:user]
 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

data/lib/devinstall/version.rb

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

data/lib/devinstall.rb

@@ -7,96 +7,100 @@ require 'devinstall/settings' ##  in near future we will have to abandon Setting
 module Devinstall
   class Pkg
 
+
+    # @param [Symbol] type
     def get_version(type)
-      if type == :deb # curently implemented only for .deb packages
-        deb_changelog          ="#{Settings.local[:folder]}/#{package}/debian/changelog"
+      if type == :deb
+        deb_changelog          = "#{Settings.local[:folder]}/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
       end
     end
+  end
 
-    def new (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
-      pname                ="#{package}_#{get_version :deb}"
-      @package_files[:deb] ={deb: "#{pname}_all.deb",
-                             tgz: "#{pname}.tar.gz",
-                             dsc: "#{pname}.dsc",
-                             chg: "#{pname}_debian.changes"}
-    end
-
-    def upload! (environment)
-      scp  =Settings.base[:scp]
-      repo =Hash.new
-      type =Settings.repos[environment][:type]
-      [:user, :host, :folder].each do |k|
-        fail("Unexistent key repos:#{environment}:#{k}") unless Settings.repos[environment].has_key?(k)
-        repo[k]=Settings.repos[environment][k]
-      end
-      build(type)
-      @package_files[type].each do |p|
-        system("#{scp} #{Settings.local[:temp]}/#{p} #{repo[:user]}@#{repo[:host]}:#{repo[:folder]}")
-      end
+  def new (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}_debian.changes"}
+  end
 
+  def upload! (environment)
+    scp  =Settings.base[:scp]
+    repo =Hash.new
+    type =Settings.repos[environment][:type]
+    [:user, :host, :folder].each do |k|
+      fail("Unexistent key repos:#{environment}:#{k}") unless Settings.repos[environment].has_key?(k)
+      repo[k]=Settings.repos[environment][k]
+    end
+    build(type)
+    @package_files[type].each do |p|
+      system("#{scp} #{Settings.local[:temp]}/#{p} #{repo[:user]}@#{repo[:host]}:#{repo[:folder]}")
     end
+  end
 
-    # @param [Symbol] type
-    def build! (type)
-      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}'")
+  # @param [Symbol] type
+  def build! (type)
+    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
+    [:user, :host, :folder, :target].each do |k|
+      unless Settings.build.has_key?(k)
+        puts("Undefined key 'build:#{k.to_s}:'")
         exit!(1)
       end
-      build =Hash.new
-      [:user, :host, :folder, :target].each do |k|
-        unless Settings.build.has_key?(k)
-          puts("Undefined key 'build:#{k.to_s}:'")
-          exit!(1)
-        end
-        build[k]=Settings.build[k]
-      end
-      ssh          =Settings.base[:ssh]
-      build_command=Settings.packages[@package][type][:build_command]
-      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)
+      build[k]=Settings.build[k]
+    end
 
-      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|
-        system("#{rsync} -az #{build[:user]}@#{build[:host]}/#{build[:target]}/#{p} #{local_temp}")
-      end
+    ssh          =Settings.base[:ssh]
+    build_command=Settings.packages[@package][type][:build_command]
+    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|
+      system("#{rsync} -az #{build[:user]}@#{build[:host]}/#{build[:target]}/#{p} #{local_temp}")
     end
+  end
 
-    def install! (environment)
-      sudo       =Settings.base[:sudo]
-      scp        =Settings.base[:scp]
-      type       =Settings.install[environment][:type]
-      local_temp =Settings.local[:temp]
-      build!(type)
-      install=Hash.new
-      [:user, :host, :folder].each do |k|
-        unless Settings.install[environment].has_key?(k)
-          puts "Undefined key 'install:#{environment.to_s}:#{k.to_s}'"
-          exit!(1)
-        end
-        install[k]=Settings[environment][k]
-      end
-      case type.to_sym
-        when :deb
-          system("#{scp} #{local_temp}/#{@package_files[type][:deb]} #{install[:user]}@#{install[:host]}/#{install[:folder]}")
-          system("#{sudo} #{build![:user]}@#{build[:host]} \"dpkg -i #{install[:folder]}/#{@package_files[type][:deb]}")
-        else
-          puts "unknown package type '#{type.to_s}'"
-          exit!(1)
+  def install! (environment)
+    sudo       =Settings.base[:sudo]
+    scp        =Settings.base[:scp]
+    type       =Settings.install[environment][:type]
+    local_temp =Settings.local[:temp]
+    build!(type)
+    install=Hash.new
+    [:user, :host, :folder].each do |k|
+      unless Settings.install[environment].has_key?(k)
+        puts "Undefined key 'install:#{environment.to_s}:#{k.to_s}'"
+        exit!(1)
       end
+      install[k]=Settings[environment][k]
+    end
+    case type.to_sym
+      when :deb
+        system("#{scp} #{local_temp}/#{@package_files[type][:deb]} #{install[:user]}@#{install[:host]}/#{install[:folder]}")
+        system("#{sudo} #{build![:user]}@#{build[:host]} \"dpkg -i #{install[:folder]}/#{@package_files[type][:deb]}")
+      else
+        puts "unknown package type '#{type.to_s}'"
+        exit!(1)
     end
   end
 end
 
+

metadata

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