ian 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f1c4418c802dc0e70d42aa29660d7cc5b86f9aa
-  data.tar.gz: 3d4ad360116e4f78a37256f6e71f6cea3deec032
+  metadata.gz: eef0a9d2b8f8eb7b3d6191ef394330eb726e3f47
+  data.tar.gz: 5af7d2748dc79cc958d96d2cd326030b198a9759
 SHA512:
-  metadata.gz: 50103f0480fcf428bdaadc62d82e834b7d7d591f9b17b1ecaf71ef51fbe4f04c605f3bff7881b8d91b1271b6248d27fc99b7e7a454e781c4a5759ac75953b2c9
-  data.tar.gz: 1fe06058c8ceebc0b0f1013376227ba8caa989f801a8bd2d72418038ab9d1e5ea94e1a7dfd8eeb2dadc660263eed77cf26399a5aa58a24f5a803573d7d926908
+  metadata.gz: 40e6d5176b2ba6e214718ed21e8f600b29d462868b6cee58389a87108822c167d30764a663c9eed54183eaf5b8cbb9a675abe4216490c437081c99dcc3a88b85
+  data.tar.gz: 094b451d2f8bb9f5ef2999df088bae4636ef85d03f8ed0127b85dd0a58e6a986a976d2f6d9e37201725a681b30f118c07491db7c41a277a41d96ceac60d9d1f2

data/README.md

@@ -9,6 +9,12 @@ bundler.
 It is intended to be helpful when integrating other build tools/systems and
 with CI/CD.
 
+## Requirements
+
+* dpkg
+* fakeroot
+* rsync
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -122,6 +128,7 @@ Need help with the control files?  Try these links:
 - [ ] add commands to help with releasing new versions/tagging
 - [ ] allow packaging past versions from git tags
 - [ ] add option for semver enforcement
+- [ ] remove rsync dependency
 
 ## Development
 

data/lib/ian.rb

@@ -68,7 +68,7 @@ module Ian
     def build_package(path, log)
       c = control(path)
       c[:size] = Utils.determine_installed_size(path)
-      Ian::Control.save(c, path)
+      Ian::Control.save(c, ctrlpath(path))
 
       pkgr = Ian::Packager.new(path, c, log)
       pkgr.run

data/lib/ian/control.rb

@@ -71,7 +71,7 @@ module Ian
     # raises Ian::ValidationError
     def self.save(ctrl, path)
       ctrl.valid!
-      File.write(File.join(path, 'control'), ctrl.to_s)
+      File.write(path, ctrl.to_s)
     end
 
     # default values for a new control file

data/lib/ian/packager.rb

@@ -4,9 +4,10 @@ require 'fileutils'
 module Ian
   class Packager
     def initialize(path, ctrl, log)
-      @path = path
+      @path = path  # this is the source path that the files to package are copied from
       @ctrl = ctrl
-      @log = log
+      @log  = log
+      @dir  = nil   # this is the tmp directory that the package is built from
     end
 
     # run the packager
@@ -44,8 +45,8 @@ module Ian
     # move extraneous stuff like README and CHANGELOG to /usr/share/doc
     def move_root_files
       docs  = "#{@dir}/usr/share/docs/#{pkgname}"
-      files = %x[find #{@dir} -type f -maxdepth 1].lines.map {|l| l.chomp}
-      raise RuntimeError, "Unable to copy root files" unless $?.success?
+      files = Dir.entries(@dir).select {|f| !File.directory?(f) }
+      return unless files.any?
 
       FileUtils.mkdir_p(docs)
 
@@ -66,7 +67,7 @@ module Ian
       FileUtils.chmod(0755, Ian.debpath(@dir))
 
       pkg    = File.join(pkgdir, "#{pkgname}.deb")
-      output = %x[dpkg-deb -b #{@dir} #{pkg}]
+      output = %x[fakeroot dpkg-deb -b #{@dir} #{pkg}]
 
       return [$?.success?, pkg, output]
     end
@@ -96,19 +97,18 @@ module Ian
     end
 
     def excludes
-      files = %w[.git .gitignore .ianignore]
+      files      = %w[.git .gitignore .ianignore]
+      ignorefile = File.join(@path, ".ianignore")
 
-      return files unless File.exist?(".ianignore")
-      File.read(File.join(@path, ".ianignore")).lines.each do |ign|
-        next if ign.start_with? "#"
-
-        ign.chomp!
-        igns = Dir["#{@path}/#{ign}"]
-        next if igns.empty?
+      return files unless File.exist?(ignorefile)
 
-        files+= igns
+      File.read(ignorefile).lines.each do |ign|
+        next if ign.start_with? "#"
+        files << ign.chomp
       end
 
+      files.each {|f| @log.debug "Ignoring file: %s" % f }
+
       files
     end
 

data/lib/ian/version.rb

@@ -1,3 +1,3 @@
 module Ian
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ian
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Robert McLeod