uberinstaller 1.0.2 → 1.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4039f958c8165c82fb9cb472055666197d7383e0
+  data.tar.gz: c4fa343b75ab2c7323b5c8a9a0e327fccc5aee37
+SHA512:
+  metadata.gz: 18461fdd0a53d1bba3046fc86de6e2d5edf66711110b47a4437310b79f35944542975c688910aac019aecb665e92d83ba4deaacd51a815460ce5b1fbce522f41
+  data.tar.gz: 320f944128a9f372dfb6634d47744d04fb2bd092d2aa8fa9001f3d74b119a5579537e218ad56c5613437307e735ec57cfadfa240fc4a0e9f2e38178a322bc987

data/README.md

@@ -49,6 +49,21 @@ after all => cmds/after/all.sh
 
 Blocking package configuration as Debconf in Debian system must be properly avoided ( APT Package Manager use gnome DEBIAN_FRONTEND to avoid apt-get hangs)
 
+## Folder structure
+
+package
+├── cmds
+├── log
+├── pkgs
+└── package.json
+
+## Variables substitution
+
+You can use some variables in package.json:
+ - `:cmds`: path to package/cmds folder
+ - `:pgks`: path to package/pkgs folder
+ - `:json`: path to package/package.json file
+
 ## Docs
 
 http://rubydoc.info/docs/yard/file/docs/GettingStarted.md

data/lib/uberinstaller/cli.rb

@@ -29,16 +29,20 @@ module Uberinstaller
                   :type => :boolean,
                   :default => false, 
                   :desc => "Enable dry run, no modification to the system will be made during this execution"
+    method_option :no_log,
+                  :type => :boolean,
+                  :default => false, 
+                  :desc => "Disable log creation, output logger on STDOUT"
     def install(file)
       Uberinstaller::Loggable.level = Logger::WARN
       Uberinstaller::Loggable.level = Logger::INFO  if options[:verbose]
       Uberinstaller::Loggable.level = Logger::DEBUG if options[:debug]
 
-      Uberinstaller::Loggable.log_path = File.join(File.dirname(file), 'log', "#{Time.now}.log") unless options[:debug]
+      Uberinstaller::Loggable.log_path = File.join(File.dirname(file), 'log', "#{Time.now}.log") unless options[:no_log]
 
       Uberinstaller::Config.uberdirectory = File.dirname file
       Uberinstaller::Config.dry_run = options[:dry_run]
-      
+
       begin
         runner = Uberinstaller.new file
         runner.preprocess

data/lib/uberinstaller/config.rb

@@ -32,7 +32,7 @@ module Uberinstaller
     @local_pkg_path = nil
     # @!attribute [r] json_path
     #   absolute path in which locate json file to be imported in configuration
-    @local_pkg_path = nil
+    @json_path = nil
     
     # @!attribute [rw] remote_package_manager
     #   the package manager used to install system type packages

data/lib/uberinstaller/installer.rb

@@ -236,7 +236,12 @@ module Uberinstaller
 
       def preprocess_json
         logger.debug 'JSON type validation'
-        validate 'json'
+        begin
+          validate 'json'
+        rescue Exception => e
+          @body[:skip] = true
+          raise e
+        end
       end
 
       def validate_json

data/lib/uberinstaller/parser.rb

@@ -4,6 +4,7 @@ require 'uberinstaller/logger'
 require 'uberinstaller/exception'
 
 require 'json'
+require 'shellwords'
 
 module Uberinstaller
   class Parser
@@ -38,6 +39,9 @@ module Uberinstaller
     def run
       begin
         @json = IO.read(@file)
+
+        @json = _replace_tokens(@json)
+
         # Comments are stripped out! FUCK YEAH!
         @data = JSON.parse @json, :symbolize_names => true
       rescue JSON::ParserError
@@ -47,5 +51,24 @@ module Uberinstaller
       end
     end
 
+    private
+
+      # Replace specific tokens with path
+      #
+      # @param file_content [String] the content of the json file in which the
+      #        substitution should take place
+      def _replace_tokens(file_content)
+        logger.debug "Replacing :cmds with #{Config.command_path.shellescape}"
+        file_content.gsub!(':cmds', Config.command_path.shellescape)
+        
+        logger.debug "Replacing :pkgs with #{Config.local_pkg_path.shellescape}"
+        file_content.gsub!(':pkgs', Config.local_pkg_path.shellescape)
+
+        logger.debug "Replacing :json with #{Config.json_path.shellescape}"
+        file_content.gsub!(':json', Config.json_path.shellescape)
+
+        file_content
+      end
+
   end
 end

data/lib/uberinstaller/runner.rb

@@ -20,6 +20,9 @@ module Uberinstaller
     #
     # @param file [String] the file name to be used for this execution
     def initialize(file)
+      logger.debug Config.command_path
+      logger.debug Config.local_pkg_path
+      logger.debug Config.json_path
       logger.info "Processing JSON file: #{file}"
       
       # check if element has already been processed
@@ -202,6 +205,8 @@ module Uberinstaller
               parser = Parser.new(file)
               data = parser.data[:packages].each { |p| p[1][:type] = get_package_type p[1] }
               nested_packages.merge! data
+
+              @packages.delete(pkg_name.to_sym)
             end
           end
         end

data/lib/uberinstaller/version.rb

@@ -1,3 +1,3 @@
 module Uberinstaller
-  VERSION = "1.0.2"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,165 +1,146 @@
 --- !ruby/object:Gem::Specification
 name: uberinstaller
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.1.1
 platform: ruby
 authors:
 - Edoardo Tenani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !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: rspec
   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: pry
   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: redcarpet
   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: yard
   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: colored
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hash_keyword_args
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "  Uberinstaller is a ruby gem that make easy to install system packages
-  from a JSON configuration file.\n  Thinked for Ubuntu, can handle pre and post installation
-  commands, repositories and PPA, package installation from system repositories, git
-  repositories or local files.\n\n  Supports different Package Managers as the defaults
-  one can be modified, extended and changed as needed.\n"
+description: |2
+    Uberinstaller is a ruby gem that make easy to install system packages from a JSON configuration file.
+    Thinked for Ubuntu, can handle pre and post installation commands, repositories and PPA, package installation from system repositories, git repositories or local files.
+
+    Supports different Package Managers as the defaults one can be modified, extended and changed as needed.
 email:
 - edoardo.tenani@gmail.com
 executables:
@@ -212,33 +193,26 @@ files:
 homepage: https://github.com/endorama/UberInstaller
 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'
-      segments:
-      - 0
-      hash: -4253208566518924367
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4253208566518924367
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Install lots of system packages from a single JSON configuration file
 test_files: []
 has_rdoc: