bunchr 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e10dbc02432e9a86050d6d50bfef5665c7e553ef
-  data.tar.gz: 3f05668357550d568a08ad33e9535f3b8fc5680b
+  metadata.gz: e33b41c1da8008ed42f82b43adf8f1d55c865408
+  data.tar.gz: e75b37cda8720b625c6e330232dd74a0bb42c7e8
 SHA512:
-  metadata.gz: 90e7b6a6a60d7d82fc516ca595f44cbdd15865e3def97347ac8ad9ac373fc8a898230b08c8763c5d84b25eb2ed46f7a1b71da4ca8ae93b834c0e03c2574f875c
-  data.tar.gz: d4d2279305d9b2402b64233077e2d81ee35c7100ac5a94d152cf042a4a6163fe30591c36f8d9c1410882147949283c2db093fb2da4bb0f46d4affacb84d74d60
+  metadata.gz: eb6a260cc02821557098c6194c651d871ec3474951ab6333bc2d8504d2aef47b8e7934454bfb3873d73394c40dfb9ebf0952c9339c0b1723ff284996434283c8
+  data.tar.gz: 9894fd7bdfb924cefbae555d8a924af350e7a6314b052c965ae53c4bf95ab9f9a0b0348e836f7a60693e3621f0320d6cea6e8c47a15ef2b15f07c96e70e8aa28

data/lib/bunchr/ohai.rb

@@ -8,6 +8,7 @@ module Bunchr
     def self.ohai
       if @@ohai.nil?
         @@ohai ||= ::Ohai::System.new
+        @@ohai.load_plugins
         @@ohai.require_plugin('os')
         @@ohai.require_plugin('platform')
       end

data/lib/bunchr/packages.rb

@@ -9,22 +9,26 @@ module Bunchr
     include ::Bunchr::Utils
 
     # only attempt to build .rpm's on these platforms (as reported by
-    # ohai.platform)
+    # ohai[:platform])
     RPM_PLATFORMS = %w[centos redhat fedora scientific suse]
 
     # only attempt to build .deb's on these platforms (as reported by
     # ohai.platform)
-    DEB_PLATFORMS = %w[debian ubuntu]
+    DEB_PLATFORMS = %w[debian ubuntu raspbian]
+
+    # only attempt to build .pkg's on these platforms (as reported by
+    # ohai[:platform])
+    PKG_PLATFORMS = %w[freebsd]
 
     attr_accessor :name, :version, :iteration, :license, :vendor, :maintainer, :url, :category
     attr_accessor :description
     attr_accessor :files, :config_files, :scripts
 
-  	def initialize
+    def initialize
       @name = nil
       @version = nil
       @iteration = nil
-      @arch = ohai['kernel']['machine']
+      @arch = ohai[:kernel][:machine]
       @license = nil
       @vendor = nil
       @maintainer = nil
@@ -38,8 +42,8 @@ module Bunchr
       define unless name.nil? or version.nil?
     end
 
-    # 
-    # returns the current architecture. Convert some architectures for the 
+    #
+    # returns the current architecture. Convert some architectures for the
     # underlying packaging systems, such as i686 to i386.
     def arch
       case @arch
@@ -63,10 +67,11 @@ module Bunchr
           define_build_tarball
           define_build_rpm
           define_build_deb
+          define_build_pkg
           # TODO-future: build solaris pkgs, windows too?!
 
           define_build_all
-          
+
           task :done    => "#{name}:build"
           task :default => "#{name}:done"
         end
@@ -92,7 +97,7 @@ module Bunchr
       desc "Build RPM: #{name}-#{version}-#{iteration}-#{arch}"
       task :build_rpm do
 
-        if RPM_PLATFORMS.include? ohai.platform
+        if RPM_PLATFORMS.include? ohai[:platform]
           logger.info "Building RPM '#{name}-#{version}-#{iteration}-#{arch}'"
 
           sh "fpm -s dir -t rpm -a #{arch} -n #{name} -v #{version} \
@@ -110,9 +115,9 @@ module Bunchr
 
           logger.info "RPM built."
         else
-          logger.info "Not building RPM, platform [#{ohai.platform}] does not support it."
+          logger.info "Not building RPM, platform [#{ohai[:platform]}] does not support it."
         end
-        
+
       end
     end
 
@@ -120,7 +125,7 @@ module Bunchr
       desc "Build deb: #{name}-#{version}-#{iteration}-#{arch}"
       task :build_deb do
 
-        if DEB_PLATFORMS.include? ohai.platform
+        if DEB_PLATFORMS.include? ohai[:platform]
           logger.info "Building DEB '#{name}-#{version}-#{iteration}-#{arch}'"
 
           sh "fpm -s dir -t deb -a #{arch} -n #{name} -v #{version} \
@@ -138,7 +143,37 @@ module Bunchr
 
           logger.info "DEB built."
         else
-          logger.info "Not building DEB, platform [#{ohai.platform}] does not support it."
+          logger.info "Not building DEB, platform [#{ohai[:platform]}] does not support it."
+        end
+
+      end
+    end
+
+    def define_build_pkg
+      desc "Build pkg: #{name}-#{version}-#{iteration}-#{arch}"
+      task :build_pkg do
+
+        if PKG_PLATFORMS.include? ohai[:platform]
+          logger.info "Building PKG '#{name}-#{version}-#{iteration}-#{arch}'"
+
+          cmd = "fpm -s dir -t freebsd -a #{arch} -n #{name} -v #{version} \
+              --iteration #{iteration}                              \
+              --url         '#{url}'                                \
+              --description '#{description}'                        \
+              --license     '#{license}'                            \
+              --vendor      '#{vendor}'                             \
+              --category    '#{category}'                           \
+              #{fpm_scripts_args}                                   \
+              #{fpm_config_files_args}                              \
+              #{config_files.join(' ')}                             \
+              #{files.join(' ')}"
+
+          logger.info cmd.inspect
+          sh cmd
+
+          logger.info "PKG built."
+        else
+          logger.info "Not building PKG, platform [#{ohai[:platform]}] does not support it."
         end
 
       end
@@ -146,7 +181,7 @@ module Bunchr
 
     def define_build_all
       desc "Build all packages: #{name}-#{version}-#{iteration}-#{arch}"
-      task :build => [:build_tarball, :build_rpm, :build_deb]
+      task :build => [:build_tarball, :build_rpm, :build_deb, :build_pkg]
     end
 
     # depend on a {Bunchr::Software} object to be built and installed
@@ -159,7 +194,7 @@ module Bunchr
     end
 
     # return an argument string for fpm with '--config-files' prefixed to
-    # every file in the config_files array. 
+    # every file in the config_files array.
     #   eg: '--config-files /etc/file1 --config-files /etc/file2'
     def fpm_config_files_args
       config_files.map { |f| '--config-files ' + f }.join(' ')

data/lib/bunchr/software.rb

@@ -67,7 +67,7 @@ module Bunchr
         desc "Download, build, and install #{name} #{version}"
         task name => "#{name}:default"
       end
-      
+
     end
 
     def define_download
@@ -96,7 +96,7 @@ module Bunchr
       end
 
       file dotfile('build') => "software:#{name}:download" do
-        logger.info "Bulding #{name} #{version}"
+        logger.info "Building #{name} #{version}"
         Dir.chdir(work_dir) do
           build
         end
@@ -111,7 +111,7 @@ module Bunchr
         logger.info "#{name} #{version} is installed"
       end
 
-      file dotfile('install') => "software:#{name}:build" do 
+      file dotfile('install') => "software:#{name}:build" do
         logger.info "Installing #{name} #{version}"
         Dir.chdir(work_dir) do
           install

data/lib/bunchr/version.rb

@@ -1,3 +1,3 @@
 module Bunchr
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bunchr
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Joe Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.26
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.26
+        version: 1.6.1
 description: |
   A DSL for building complex software projects and packaging them (RPM, DEB, etc).
   Originally developed to create "omnibus" style packages that include an entire
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 3
 summary: A DSL for bundling complex software projects into 'omnibus'-style packages.