devinstall 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 65c942b9af93dd07a39c2029c07bde331ac05ea5
+  data.tar.gz: 5225f01ff5e97008bb5ae05a45f44563d9541ba8
+SHA512:
+  metadata.gz: b5f54243bf6f26420dae3a3f60c0266aaa9ceca9b551822fbbe1ecc4eb80203bcace3ba406efedc605889d48d84a3d440bc9ef6883a98215b0e5d7c5b59008d3
+  data.tar.gz: 561bb68c5072a1b11b110ed18632560c0f1dca94702f8e3697ae255f2c9bc8d6a75d08dc07ef8ccaf65b717db07c695ff6ef3594b2426f62fd275e3db6067f05

data/.idea/devinstall.iml

@@ -15,9 +15,9 @@
     </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-p392) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="getopt (v1.4.1, ruby-1.9.3-p392) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.3, ruby-1.9.3-p392) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.3.4, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="getopt (v1.4.1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.3, RVM: ruby-2.0.0-p0) [gem]" level="application" />
   </component>
 </module>
 

data/.idea/misc.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="ruby-1.9.3-p392" project-jdk-type="RUBY_SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-2.0.0-p0" project-jdk-type="RUBY_SDK" />
 </project>
 

data/bin/pkg-tool

@@ -3,6 +3,7 @@
 require 'getopt/long'
 require 'devinstall'
 require 'devinstall/settings'
+require 'pp'
 
 begin
   opt =Getopt::Long.getopts(
@@ -36,20 +37,30 @@ if opt['help']
   help!
   exit!(0)
 end
-
+unless opt['config']
+  puts 'You must specify a config file'
+  exit! 1
+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]
+  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
-Settings.load!(opt['config'])
-package=Pkg.new(opt['package'])
+
+package=Devinstall::Pkg.new(opt['package'])
 
 if opt['build']
-  package.build!(opt['type'].to_sym)
+  package.build(opt['type'].to_sym)
 elsif opt['install']
-  package.build!(opt['type'].to_sym)
-  package.install!(opt['env'].to_sym)
+  package.build(opt['type'].to_sym)
+  package.install(opt['env'].to_sym)
 elsif opt['upload']
-  package.build!(opt['type'].to_sym)
-  package.upload!(opt['env'].to_sym)
+  package.build(opt['type'].to_sym)
+  package.upload(opt['env'].to_sym)
 end

data/lib/devinstall/deep_symbolize.rb

@@ -11,11 +11,8 @@
 # 1) class Hash; include DeepSymbolizable; end
 # 2) myhash.extend DeepSymbolizable
 
-module DeepSymbolizable
 
-  class Hash
-    include DeepSymbolizable
-  end
+module DeepSymbolizable
 
   def deep_symbolize(&block)
     method = self.class.to_s.downcase.to_sym

data/lib/devinstall/settings.rb

@@ -1,7 +1,11 @@
 require 'yaml'
-require 'devinstall/deep_symbolize'
+
+class Hash
+  include DeepSymbolizable
+end
 
 module Settings
+
   extend self
 
   @_settings = {}
@@ -23,6 +27,10 @@ module Settings
     target.merge! data, &merger
   end
 
+  def defaults
+    @_settings[:defaults]
+  end
+
   def base
     @_settings[:base]
   end

data/lib/devinstall/version.rb

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

data/lib/devinstall.rb

@@ -1,22 +1,27 @@
 require 'devinstall/version'
+require 'devinstall/deep_symbolize'
 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 'pp'
 
 module Devinstall
+
+
   class Pkg
 
     # @param [Symbol] type
     def get_version(type)
       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")
+        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
       end
     end
 
-    def new (package)
+    # @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:
@@ -26,29 +31,34 @@ module Devinstall
       @package_files[:deb] ={deb: "#{pname}_#{arch}.deb",
                              tgz: "#{pname}.tar.gz",
                              dsc: "#{pname}.dsc",
-                             chg: "#{pname}_debian.changes"}
+                             chg: "#{pname}_amd64.changes"}
     end
 
-    def upload (environment)
+    def upload (env)
+      unless Settings.repos[:environments][env]
+        puts "Undefined environment '#{env}'"
+        exit! 1
+      end
       scp =Settings.base[:scp]
       repo =Hash.new
-      type =Settings.repos[environment][:type]
+      type =Settings.repos[:environments][env][:type].to_sym
       [: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]
+        fail("Unexistent key repos:#{env}:#{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|
+      @package_files[type].each do |t,p|
+        puts "Uploading target #{t}(#{p}) to #{repo[:user]}@#{repo[:host]}:#{repo[:folder]}"
         system("#{scp} #{Settings.local[:temp]}/#{p} #{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("Package '#{@package}' cannot be built for the required env")
         puts("undefined build configuration for '#{type.to_s}'")
-        exit!(1)
+        exit! 1
       end
       build =Hash.new
       [:user, :host, :folder, :target].each do |k|
@@ -62,38 +72,44 @@ module Devinstall
       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)
+      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]).
+          gsub('%p', @package.to_s).
+          gsub('%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}")
+      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]}"
+        system("#{rsync} -az #{build[:user]}@#{build[:host]}:#{build[:target]}/#{t} #{local_temp}")
       end
     end
 
-    def install (environment)
+    def install (env)
+      unless Settings.repos[:environments][env]
+        puts "Undefined environment '#{env}'"
+        exit! 1
+      end
+      puts "Installing #{@package} in #{env} environment."
       sudo =Settings.base[:sudo]
       scp =Settings.base[:scp]
-      type =Settings.install[:environment][:type]
+      type=Settings.install[:environments][env][:type].to_sym
       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}'"
+        unless Settings.install[:environments][env].has_key? k
+          puts "Undefined key 'install:environments:#{env.to_s}:#{k.to_s}'"
           exit!(1)
         end
-        install[k]=Settings.install[environment][k]
+        install[k]=Settings.install[:environments][env][k]
       end
-      case type.to_sym
+      case type
         when :deb
           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]}")
+          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)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devinstall
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Dragos Boca
@@ -14,49 +13,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: getopt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: remote builder and installer
@@ -93,27 +86,26 @@ files:
 homepage: http://github.com/dboca/devinstall
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Copy the source files to a build host, build the packages and install builded
   packages
 test_files: []