fpm-scriptable 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 462abaa26e46eef0c790fd3817797f0fd773a68f
-  data.tar.gz: c5f38036216be412ec63e8db0359b7988403eb37
+  metadata.gz: 7dda735651b1e39ddc8914ed1b8d81df040df757
+  data.tar.gz: bb76ab8965379c1435ef8c603efc3f5cc560cf73
 SHA512:
-  metadata.gz: ec2237f35dcd887378dd5546940cf4a55577820ec04ce95c21d8bbb94e9b927eea144cf05c080d3246043acecb33cfe1074c5f08e41470c052cc382cfd870e84
-  data.tar.gz: 3d9e535434ae2d547c07312732c06b5fa552c4ea1093abbf697946e5ab3ebcbfcb99f9c842b20ea23f013adbabec2af2f0b3d58aab26eb2e1fa86d81284aba49
+  metadata.gz: b3273b44adbb74ef99e11eaa7c4564908d46ae4e1433e70896c973228c338630ab6a966147e02c67f6c8598b27d203895f21a4b82bfa90bb86088d8f6b3309f7
+  data.tar.gz: 4723d15dc9e4bbb5d20c7ccb7a5d655ac67eafa9c6a18d0738501d9d34b9719d596d899dfbc4eea1395c859a47e3cc80f12dca1e088c621f5d5341d6f7768d61

data/bin/fpm-script

@@ -13,25 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-bin_path = String.new
-bin_dir = String.new
-app_dir = String.new
+require 'rubygems'
+$: << File.join(File.dirname(__FILE__), "..", "lib")
+require 'fpm/scriptable'
 
-bin_path = File.expand_path($0)
-if bin_path && bin_path != ""
-  bin_dir = File.dirname(bin_path)
-end
-
-if bin_dir && bin_dir != ''
-  app_dir = "#{bin_dir}/.."
-  $:.push "#{app_dir}/lib"
-else
-  puts 'Error: unable to locate bin directory'
-  exit 1
-end
-
-Dir.chdir(app_dir) do
-  require 'fpm/scriptable'
-end
-FPM::Scriptable::App.run(app_dir)
-exit 0
+exit(FPM::Scriptable::App.run || 0)

data/lib/fpm/scriptable.rb

@@ -19,18 +19,12 @@ require 'fpm'
 require 'curb'
 
 require 'fpm/scriptable/version'
+require 'fpm/scriptable/app'
+require 'fpm/scriptable/config'
+require 'fpm/scriptable/log'
+require 'fpm/scriptable/util'
+require 'fpm/scriptable/constants'
+require 'fpm/scriptable/script'
 
-module FPM
-  module Scriptable
-    # Core classes
-    autoload :App, "fpm/scriptable/app"
-    autoload :Config, "fpm/scriptable/config"
-    autoload :Log, "fpm/scriptable/log"
-    autoload :Util, "fpm/scriptable/util"
-    autoload :Constants, "fpm/scriptable/constants"
-    autoload :Script, "fpm/scriptable/script"
-
-    # Package type plugins
-    autoload :RPM, "fpm/scriptable/plugin/rpm"
-  end
-end
+# Package type plugins
+require 'fpm/scriptable/plugin/rpm'

data/lib/fpm/scriptable/app.rb

@@ -16,7 +16,7 @@ module FPM
   module Scriptable
     class App
 
-      def self.run(app_dir)
+      def self.run
         @log = FPM::Scriptable::Log.instance
         args = FPM::Scriptable::Util.get_args
 
@@ -30,31 +30,24 @@ module FPM
           @log.add(level.to_sym, @log.color, STDOUT)
         end
 
-        @log.show FPM::Scriptable::Util.banner, @log.quiet, true
+        @log.show FPM::Scriptable::Util.banner unless args[:nobanner]
 
         if args[:help] || args[:h]
-          @log.show FPM::Scriptable::Util.usage, false, false
-          exit 0
+          @log.show FPM::Scriptable::Util.usage, false
+          return 1
         end
 
         cfg = FPM::Scriptable::Config.instance
         @config = cfg.config
-        @config.app_dir = app_dir
         @config.working_dir = Dir.getwd
 
         script = args[:script]
         if script.nil?
           @log.fatal 'FPM::Scriptable::App - No script file was specified'
-          @log.show FPM::Scriptable::Util.usage, @log.quiet, false
-          exit 1
+          @log.show FPM::Scriptable::Util.usage
         else
           if script !~ /^\//
-            script = "#{@config.app_dir}/#{script}"
-
-            if !File.exists? script
-              script = args[:script]
-              script = "#{@config.working_dir}/#{script}"
-            end
+            script = "#{@config.working_dir}/#{script}"
           end
 
           @log.debug "FPM::Scriptable::App - Script file path set to: #{script}"
@@ -94,7 +87,8 @@ module FPM
           end
         end
 
-        exit 0
+        return 1 if @log.has_error
+        return 0
       end
 
    end

data/lib/fpm/scriptable/config.rb

@@ -29,11 +29,8 @@ module FPM
       protected
 
       class GeneralConfig
-        attr_accessor :app_dir
 
         def initialize
-          @app_dir        = nil
-
           @u_defined      = {}
         end
 

data/lib/fpm/scriptable/log.rb

@@ -17,21 +17,18 @@ module FPM
     class Log
       include Singleton
       attr_accessor :quiet, :color
+      attr_reader :has_error
 
       def initialize
         @quiet = false
         @color = true
 
         @logger = nil
+        @has_error = false
       end
 
-      def show(msg,quiet=@is_quiet,in_color=false)
-        if msg
-          if @color && in_color
-            msg = "\e[33m#{msg}\e[0m"
-          else
-            msg = "\e[0m#{msg}\e[0m"
-          end
+      def show(msg,quiet=@quiet)
+        if !msg.nil?
           puts msg unless quiet
         end
       end
@@ -49,7 +46,7 @@ module FPM
       end
 
       def info(msg)
-        if msg
+        if !msg.nil?
           if !@logger.nil?
             @logger.info msg
           end
@@ -57,7 +54,7 @@ module FPM
       end
 
       def warn(msg)
-        if msg
+        if !msg.nil?
           if !@logger.nil?
             @logger.warn msg
           end
@@ -65,7 +62,7 @@ module FPM
       end
 
       def debug(msg)
-        if msg
+        if !msg.nil?
           if !@logger.nil?
             @logger.debug msg
           end
@@ -73,7 +70,8 @@ module FPM
       end
 
       def error(msg)
-        if msg
+        @has_error = true
+        if !msg.nil?
           if !@logger.nil?
             @logger.error msg
           end
@@ -81,7 +79,8 @@ module FPM
       end
 
       def fatal(msg)
-        if msg
+        @has_error = true
+        if !msg.nil?
           if !@logger.nil?
             @logger.fatal msg
           end

data/lib/fpm/scriptable/script.rb

@@ -52,7 +52,7 @@ module FPM
         @config           = FPM::Scriptable::Config.instance.config
         c                 = FPM::Scriptable::Constants.instance
 
-        @log.debug 'FPM::Scriptable::RPM - initializing Script'
+        @log.debug 'FPM::Scriptable::Script - initializing Script'
 
         @version          = c.script.version
         @iteration        = c.script.iteration
@@ -63,11 +63,11 @@ module FPM
       end
 
       def fpm_obj
-        @log.error 'fpm_obj method not implemented in plugin'
+        @log.warn 'FPM::Scriptable::Script - fpm_obj method not implemented in plugin'
       end
 
       def fpm_convert
-        @log.error 'fpm_convert method not implemented in plugin'
+        @log.warn 'FPM::Scriptable::Script - fpm_convert method not implemented in plugin'
       end
 
       def plugin_init
@@ -128,7 +128,7 @@ module FPM
           #@fpm.directories +=
           #@fom.attributes[:excludes]
         rescue Exception => e
-          log.error "#{e}"
+          @log.error "FPM::Scriptable::Script - #{e}"
         end
 
         package = nil
@@ -141,20 +141,20 @@ module FPM
                 if !overwrite.nil?
                   force = overwrite.to_s.downcase
                   if force == 'true'
-                    @log.info "Overwrite enabled - Removing package: #{package.to_s}"
+                    @log.warn "FPM::Scriptable::Script - overwrite enabled - removing package: #{package.to_s}"
                     FileUtils.rm_f(package.to_s)
                   end
                 end
               end
 
-              @log.info "Building package: #{package.to_s}"
+              @log.info "FPM::Scriptable::Script - building package: #{package.to_s}"
               package.output(package.to_s)
             end
           else
-            @log.error 'Failed to convert - Packaging object is invalid'
+            @log.error 'FPM::Scriptable::Script - failed to convert - packaging object is invalid'
           end
         rescue Exception => e
-          log.error "#{e}"
+          @log.error "FPM::Scriptable::Script - #{e}"
         end
 
       end

data/lib/fpm/scriptable/util.rb

@@ -51,17 +51,17 @@ module FPM
 
       def self.usage
         usage = <<EOF
-
-  Usage:
+Usage:
   #{$0} OPTIONS
 
-    Options:
-      --help                  Display this help screen
-      --quiet                 Messages are not displayed to the console
-      --nocolor               Turn off colors in console output
-      --log_level <lvl>       STDOUT log level (info, debug, error)
+  Options:
+    --help                  Display this help screen
+    --quiet                 Messages are not displayed to the console
+    --nocolor               Turn off colors in console output
+    --log_level <lvl>       Log level (info, debug, error)
+    --nobanner              Do not show the banner
 
-      --script <file>         Script to build
+    --script <file>         Script to build
 
 EOF
         usage
@@ -78,11 +78,11 @@ EOF
  |_| | .__/|_| |_| |_|     |___/\\___|_|  |_| .__/ \\__\\__,_|_.__/|_|\\___|
      |_|                                   |_|
 
+ #{c.name}
+ Version: #{c.version}
+ Author:  #{c.author}
+ Website: #{c.website}
 
-   #{c.name}
-   Version: #{c.version}
-   Author:  #{c.author}
-   Website: #{c.website}
 EOF
         banner
       end

data/lib/fpm/scriptable/version.rb

@@ -15,7 +15,7 @@
 module FPM
   module Scriptable
     NAME    = 'fpm-scriptable'
-    VERSION = '1.0'
+    VERSION = '1.0.1'
     AUTHOR  = 'Ted Elwartowski'
     EMAIL   = '<xelwarto.pub@gmail.com>'
     WEBSITE = 'https://github.com/xelwarto/fpm-scriptable'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-scriptable
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Ted Elwartowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2015-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb