devinstall 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bb5beb672121e7653746c5657c2ab46bb7f92f0
-  data.tar.gz: f228e14e80ba1a181df53709035afda7831b0b3b
+  metadata.gz: b0fdc7da0cef9c25edf168422feb0365b5319077
+  data.tar.gz: 9058195208de13470e301f22899d17ef6d26b68e
 SHA512:
-  metadata.gz: ff9e44b19f0197ade70359e1b34167bd5d112bf456b59d5ec20d580665360b764ab56cb6784f4825f6e440b54792105fa8571f22c3a08e18e008c86864cd6b54
-  data.tar.gz: 9000670caa9ab71c0240e950de774c0b416fc59002d7e7f5ac887511eb2531ef6aba8cf0fbba33c3b2d1cc3288a3e5fa7ff4d80b7fd6801ecb658609805a5fac
+  metadata.gz: 07e5ce63ab6e5afca185b39b299d4969a9e0875647f59610050baf25b2adae6972c209007c59b1064a7375e1e46a4929192f38489017faec2b14362ebf55dc19
+  data.tar.gz: 8b3f945bdcd09c6b6b31c8a39d31ebaefa74c4d860eb8f93107722609ef4302e6dc5c64a6e45dea31b9f2274134f54316fe09313cdf4ba5072007dbdb242d36e

data/.gitignore

@@ -14,3 +14,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+pkg
+

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+

data/README.md

@@ -1,12 +1,24 @@
-# Devinstall  [![Gem Version][GV img]][Gem Version]
+# Devinstall  [![Gem Version][GV img]][Gem Version]  [![Build status][Build img]][Build status]  [![CodeClimate status][CodeClimate img]][CodeClimate status]  [![Coverage Status][Coverage img]][Coverage Status]
 
 [Gem Version]: https://rubygems.org/gems/devinstall
 
 [GV img]: https://badge.fury.io/rb/devinstall.png
 
+[Build status]: https://travis-ci.org/dragosboca/devinstall
+
+[Build img]: https://travis-ci.org/dragosboca/devinstall.png
+
+[CodeClimate Status]: https://codeclimate.com/github/dragosboca/devinstall
+
+[CodeClimate img]: https://codeclimate.com/github/dragosboca/devinstall.png
+
+[Coverage Status]: https://coveralls.io/r/dragosboca/devinstall?branch=master
+
+[Coverage img]: https://coveralls.io/repos/dragosboca/devinstall/badge.png?branch=master
+
 This is a poor man automatic package builder / installer / deployer.
 
-The build happens on a remote machine (in the future on several remote machines by package type)
+The build is done on a remote machine (in the future on several remote machines by package type)
 via external tools rsync and ssh.
 
 The packages are installed on the remote machines also via external rsync/scp and sshsudo
@@ -28,12 +40,12 @@ Or install it yourself as:
 
 ## Usage
 
-When you install the gem, the installer automaticaly install a program named pkg-tool. 
+When you install the gem, the installer automatically install a program named pkg-tool. 
 All the actions can be done via this tool.
 
 The general command line syntax is:
 
-	$ pkg_tool <action> [<package>] [--env <environment>] [--type <type>] [--config <config_file>]
+	$ pkg_tool <action> [<package>] [--env=<environment>] [--type=<type>] [--config=<config_file>]
 
 Where:
 
@@ -45,7 +57,7 @@ Builds the package on the `build/env/host` and copy the package file(s) back in
 
     install
 
-Build (using `build` command) and install the builded package on the `install/env/host`
+Build (using `build` command) and install the built package on the `install/env/host`
 
     tests
 
@@ -59,11 +71,14 @@ Build the package, run the tests and upload thr file to the repo
 
 The command line switches are:
 
-  --config: the config file (defaults to ./devinstall.yml)
+    --config=<config_file>
+  the config file (defaults to ./devinstall.yml)
 
-  --env: the environment for the install or upload action
+    --env=<environment>
+  the environment for the install or upload action
 
-  --type: only for –action build and specifies the package type (deb, rpm, tar.gz, arc....)
+    --type=<type>
+  the package type (`deb`, `rpm`, `tar.gz`, `arc`....)
 
 The switches override the defaults in the config file
 
@@ -83,14 +98,14 @@ This will build and upload package "devinstall" to repository for dev-rh environ
 
 In order to set all the variables and to define commands to do when building or installing you need a configuration file.
 
-The said config file have simple YAML structure and should define the folowing parameters:
+The said config file have simple YAML structure and should define the following parameters:
 
     local:    
       folder:
       temp:
 
 The folder where the source/prepackaged files are on the local (developer) machine (`:folder`) and the
-temporary folder where the generated packages will be downloades
+temporary folder where the generated packages will be downloaded
 
     build:
       folder: 
@@ -103,26 +118,26 @@ temporary folder where the generated packages will be downloades
 
 In order:
 
-  - the folder where the sources should be copied (might be ignored by some provider_plugins)
+  - The folder where the sources should be copied (might be ignored by some provider_plugins)
 
   - The command used to build the package (like `make package` or `dpkg-buildpackage`)
 
   - The provider for the build machine (like the `local` machine or another machine
   accessible only by SSH - `ssh` 
 
-  - the package type ( `deb`ian, `rpm`, ...)
+  - The package type ( `deb`ian, `rpm`, ...)
 
-  - the architecture (might be ignored by some package_plugins)
+  - The architecture (might be ignored by some package_plugins)
 
-  - and the folder where the package builder will put the builded packages
+  - And the folder where the package builder will put the built packages
 
-  - env define an environment (lyke `prod` or `QA`) for which the package will be built / installed
+  - `env` define an environment (like `prod` or `QA`) for which the package will be built / installed
 
 Unlike the other parameters env is optional 
   
-    install:
+    install: #<-- This is a section
       folder:
-      command:
+      command:  #<-- This is a parameter
       provider:
       type:
       arch:
@@ -141,7 +156,7 @@ Unlike the other parameters env is optional
               
 The parameters have the same meaning as for `build:`
  `repos` reffers to the package repository
- `tests` is optional (DON'T do this) and no tests will be performend if it's missing
+ `tests` is optional (DON'T do this) and no tests will be performed if it's missing
 
     defaults:
       type:
@@ -152,9 +167,9 @@ The default `type` and `env` if you don't use command-line switches
 
 The order in which the parameters will be searched is:
 
-  - local
+  - local:
 
-Like:
+Example:
 
     packages:
       <package_name>:
@@ -166,13 +181,13 @@ Like:
               
   - or global:
 
-Like
+Like:
 
       <section>:
         <env>:
           <parameter>: value
 
-The parameters speciffied per package have priority over the global ones
+The parameters specified per package have priority over the global ones
 
 In any case `env` is optional
 
@@ -183,3 +198,7 @@ In any case `env` is optional
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/dboca/devinstall/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/Rakefile

@@ -1,6 +1,8 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
+task :default => :spec
+
 desc 'Run all examples'
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = './spec/spec_helper.rb'
@@ -14,3 +16,4 @@ task :coverage do
   SimpleCov.start 'gem'
   Rake::Task[:spec].execute
 end
+

data/devinstall.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'simplecov-gem-adapter'
+  spec.add_development_dependency 'coveralls'
   spec.add_dependency 'getopt'
   spec.add_dependency 'commander'
 end

data/lib/devinstall/package.rb

@@ -9,14 +9,12 @@ module Devinstall
   class UndeffError < RuntimeError;
   end
 
-
   class Package
     include Utils
 
-    #noinspection RubyResolve
     def load_package_plugin(type)
-      require "devinstall/pkg/pkg_#{type.to_s}"
-      self.singleton_class.send(:include, Kernel.const_get("Pkg").const_get("#{type.to_s.capitalize}"))
+      require "devinstall/package/pkg_#{type.to_s}"
+      self.singleton_class.send(:include, Kernel.const_get('Pkg').const_get("#{type.to_s.capitalize}"))
     end
 
     def initialize(pkg, type, env)
@@ -48,7 +46,7 @@ module Devinstall
       end
     rescue KeyNotDefinedError => e
       puts e.message
-      raise "Error uploading #{pkg}"
+      raise "Error building #{pkg}"
     end
 
     def install(pkg=@package, type=@type, env=@env)
@@ -61,7 +59,7 @@ module Devinstall
       end
     rescue KeyNotDefinedError => e
       puts e.message
-      raise "Error uploading #{pkg}"
+      raise "Error installing #{pkg}"
     end
 
     def run_tests(pkg=@package, type=@type, env=@env)
@@ -79,7 +77,7 @@ module Devinstall
       tester.do_action
     rescue KeyNotDefinedError => e
       puts e.message
-      raise "Error uploading #{pkg}"
+      raise "Error testing #{pkg}"
     end
 
   end

data/lib/devinstall/{pkg → package}/pkg_deb.rb

@@ -29,3 +29,4 @@ module Pkg
     end
   end
 end
+

data/lib/devinstall/provider.rb

@@ -1,17 +1,23 @@
 module Devinstall
   class Provider
 
-    #noinspection RubyResolve
+    def load_provider_plugin(provider)
+      require "devinstall/provider/provider_#{provider}"
+      self.singleton_class.send(:include, Kernel.const_get('Provider').const_get("#{provider.capitalize}"))
+      provider_settings=Kernel.const_get('Provider').const_get("#{provider.capitalize}")::SETTINGS
+    end
+
     def initialize(pkg, type, env, action=nil)
       providers={build: :build, install: :install, upload: :repos, run_tests: :tests}
       @pkg, @type, @env = (pkg.to_sym rescue pkg), (type.to_sym rescue type), (env.to_sym rescue env)
       @action           = action || providers[caller_locations(1, 1)[0].label.to_sym] # that's realy stupid!
-      provider          = Settings.instance.send(action, :provider, pkg: pkg, type: type, env: env)
-      require "devinstall/provider/provider_#{provider}"
-      self.singleton_class.send(:include, Kernel.const_get('Provider').const_get("#{provider.capitalize}"))
-      provider_settings=Kernel.const_get('Provider').const_get("#{provider.capitalize}")::SETTINGS
+      provider          = Settings.instance.send(action, :provider, pkg: @pkg, type: @type, env: @env)
+      provider_settings = load_provider_plugin(provider)
       Settings.instance.register_provider(provider.to_sym, provider_settings)
-      ObjectSpace.define_finalizer(self, Proc.new{Settings.instance.unregister_provider(provider)})
+      provider_init
+      ObjectSpace.define_finalizer(self, Proc.new{
+                                     provider_final
+                                     Settings.instance.unregister_provider(provider)})
     end
 
     def copy_sources # that's upload sources
@@ -51,3 +57,4 @@ module Devinstall
 
   end
 end
+

data/lib/devinstall/provider/provider_local.rb

@@ -9,6 +9,10 @@ module Provider
       local: [:copy, :sudo],
     }
 
+    def provider_init;end
+    
+    def profider_final;end
+    
     def upload_sources(cfg, src, dst)
       config =Devinstall::Settings.instance
       copy_command=config.local[:copy]

data/lib/devinstall/provider/provider_ssh.rb

@@ -13,6 +13,10 @@ module Provider
         ssh:     [:ssh, :scp, :rsync, :sudo]
     }
 
+    def provider_init;end
+    
+    def profider_final;end
+
     def upload_sources(cfg, src, dst)
       config =Devinstall::Settings.instance
       rsync  = config.ssh(:rsync)

data/lib/devinstall/settings.rb

@@ -53,16 +53,17 @@ module Devinstall
     end ## Class Action
 
     def load! (filename)
-      if FILES.include? filename
-        true
-      else
-        FILES << filename
-        data   = YAML::load_file(filename).deep_symbolize
-        merger = proc do |_, v1, v2|
-          Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2
-        end
-        SETTINGS.merge! data, &merger
-      end if File.exist?(File.expand_path(filename))
+       if FILES.include? filename
+          true
+       else
+          FILES << filename
+          data   = YAML::load_file(filename).deep_symbolize
+          merger = proc do |_, v1, v2|
+             Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2
+          end
+          SETTINGS.merge! data, &merger
+       end if File.exist?(File.expand_path(filename))
+      FILES.include? filename
     end
 
     def method_missing (method, *args)

data/lib/devinstall/version.rb

@@ -1,3 +1,3 @@
 module Devinstall
-  VERSION = '1.2.2' # Working!
+  VERSION = '1.2.3' # Working!
 end

data/spec/assets/example_01.yml

@@ -18,7 +18,7 @@ tests:
 local:
 # folder - source folder
 # temp - temporary folder
-  folder: ~/projects/devinstall/spec/assets
+  folder: ./spec/assets
   temp: ~/.tmp
 build:
 # host - build machine

data/spec/assets/example_02.yml

@@ -19,7 +19,7 @@ tests:
 local:
 # folder - source folder
 # temp - temporary folder
-  folder: ~/projects/devinstall/spec/assets
+  folder: .//spec/assets
   temp: ~/.tmp
 build:
 # host - build machine

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'devinstall/settings'
 
 def clean_config

data/spec/support/01_settings_spec.rb

@@ -1,61 +1,63 @@
 require 'rspec'
 require 'devinstall'
-
+require 'pp'
 describe 'Settings' do
 
-  it 'should load an existig file' do
-    expect(@config.load!('./spec/assets/example_02.yml')).to be_true
-  end
-
-  it 'should not load an unexisting file' do
-    expect(@config.load!('doc/unexisting.yml')).to be_false
-  end
-
-  it 'should load at init' do
-    expect(@config).to be_an_instance_of(Devinstall::Settings)
-    [:defaults, :local, :build, :install, :tests, :repos].each do |p|
-      expect(@config.respond_to? p).to be_true
-    end # all sections loaded!
-  end
-
-  it 'should have a method defaults' do
-    expect(@config.respond_to? :defaults).to be_true
-  end
-
-  it 'the method "defaults" should have only one argument' do
-    expect(@config.defaults(:type)).to eq 'deb'
-  end
-
-  it 'should instantiate a new "Action" when hashes are given' do
-    expect(@config.build(type: 'deb', env: 'dev', pkg: @package)).to be_an_instance_of(Devinstall::Settings::Action)
-  end
-
-  it 'should instantiata a new "Action" when partial hashes are given' do
-    expect(@config.build(pkg: @package)).to be_an_instance_of(Devinstall::Settings::Action)
-  end
-
-  it 'should raise "UnknownKeys" errors for unknown keys' do
-    expect { @config.defaults :none }.to raise_error(Devinstall::UnknownKeyError)
-  end
-
-  it 'should raise "KeyNotDefinedError" errors for undefined keys' do
-    expect { @config.tests(:provider, pkg: @package) }.to raise_error(Devinstall::KeyNotDefinedError)
-  end
-
-  it 'should produce a value if all arguments are valid' do
-    expect(@config.build(:command, pkg: @package)).to eq('cd %f/%p && dpkg-buildpackage')
-  end
-
-  describe 'Action' do
-    it 'should have a [] method' do
-      rr=@config.build(pkg: @package, type: @type, env: @env)
-      expect(rr[:target]).to eq('rs')
-    end
-
-    it 'should enumerate all defined values' do
-      ar=[]
-      @config.build(pkg: @package, type: @type, env: @env).each { |k, _| ar << k }
-      expect(ar.sort == [:folder, :command, :provider, :type, :arch, :target].sort).to be_true
-    end
-  end
+   it 'should load an existig file' do
+      res=@config.load!('./spec/assets/example_02.yml')
+      expect(res).to be true
+   end
+
+   it 'should not load an unexisting file' do
+      res=@config.load!('doc/unexisting.yml')
+      expect(res).to be false
+   end
+
+   it 'should load at init' do
+      expect(@config).to be_an_instance_of(Devinstall::Settings)
+      [:defaults, :local, :build, :install, :tests, :repos].each do |p|
+         expect(@config.respond_to? p).to be true
+      end # all sections loaded!
+   end
+
+   it 'should have a method defaults' do
+      expect(@config.respond_to? :defaults).to be true
+   end
+
+   it 'the method "defaults" should have only one argument' do
+      expect(@config.defaults(:type)).to eq 'deb'
+   end
+
+   it 'should instantiate a new "Action" when hashes are given' do
+      expect(@config.build(type: 'deb', env: 'dev', pkg: @package)).to be_an_instance_of(Devinstall::Settings::Action)
+   end
+
+   it 'should instantiata a new "Action" when partial hashes are given' do
+      expect(@config.build(pkg: @package)).to be_an_instance_of(Devinstall::Settings::Action)
+   end
+
+   it 'should raise "UnknownKeys" errors for unknown keys' do
+      expect { @config.defaults :none }.to raise_error(Devinstall::UnknownKeyError)
+   end
+
+   it 'should raise "KeyNotDefinedError" errors for undefined keys' do
+      expect { @config.tests(:provider, pkg: @package) }.to raise_error(Devinstall::KeyNotDefinedError)
+   end
+
+   it 'should produce a value if all arguments are valid' do
+      expect(@config.build(:command, pkg: @package)).to eq('cd %f/%p && dpkg-buildpackage')
+   end
+
+   describe 'Action' do
+      it 'should have a [] method' do
+         rr=@config.build(pkg: @package, type: @type, env: @env)
+         expect(rr[:target]).to eq('rs')
+      end
+
+      it 'should enumerate all defined values' do
+         ar=[]
+         @config.build(pkg: @package, type: @type, env: @env).each { |k, _| ar << k }
+         expect(ar.sort == [:folder, :command, :provider, :type, :arch, :target].sort).to be true
+      end
+   end
 end

data/spec/support/02_pkg_spec.rb

@@ -8,7 +8,7 @@ describe 'Packages' do
 
   it 'should include the correct file' do
     pk=Devinstall::Package.new(@package, @type, @env)
-    expect(pk.singleton_class.include?(Pkg::Deb)).to be_true
+    expect(pk.singleton_class.include?(Pkg::Deb)).to be true
   end
 
   describe 'pkg_deb' do
@@ -16,29 +16,30 @@ describe 'Packages' do
       $dry=true
       pk  =Devinstall::Package.new(@package, @type, @env)
       out = capture_output { pk.build(@package, @type, @env) }
-      expect(out).to match /^Building/
+      expect(out).to match(/^Building/)
     end
 
     it 'should pretend to upload a package' do
       $dry=true
       pk  =Devinstall::Package.new(@package, @type, @env)
       out = capture_output { pk.upload(@package, @type, @env) }
-      expect(out).to match /^Upload/
+      expect(out).to match(/^Upload/)
     end
 
     it 'should pretend to test a package' do
       $dry=true
       pk  =Devinstall::Package.new(@package, @type, @env)
       out = capture_output { pk.run_tests(@package, @type, @env) }
-      expect(out).to match /^Running/
+      expect(out).to match(/^Running/)
     end
 
     it 'should pretend to install a package' do
       $dry=true
       pk  =Devinstall::Package.new(@package, @type, @env)
       out = capture_output { pk.install(@package, @type, @env) }
-      expect(out).to match /^Installing/
+      expect(out).to match(/^Installing/)
     end
-
   end
+
 end
+

data/spec/support/03_provider_spec.rb

@@ -9,6 +9,6 @@ describe 'Provider' do
 
   it 'should load the correct (Provider::Ssh) plugin' do
     provider = Devinstall::Provider.new(@package, @type, @env, @action)
-    expect(provider.singleton_class.include? Provider::Ssh).to be_true
+    expect(provider.singleton_class.include? Provider::Ssh).to be true
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devinstall
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Dragos Boca
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: getopt
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +131,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README
@@ -129,8 +144,8 @@ files:
 - lib/devinstall/cli.rb
 - lib/devinstall/deep_symbolize.rb
 - lib/devinstall/package.rb
-- lib/devinstall/pkg/pkg_deb.rb
-- lib/devinstall/pkg/pkg_rpm.rb
+- lib/devinstall/package/pkg_deb.rb
+- lib/devinstall/package/pkg_rpm.rb
 - lib/devinstall/provider.rb
 - lib/devinstall/provider/provider_local.rb
 - lib/devinstall/provider/provider_ssh.rb
@@ -164,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Copy the source files to a build host, build the packages and install builded