packager-dsl 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42215c276926e0d4783fa92a7a27c10210f856cf
-  data.tar.gz: b808a1736416be2e501bc6c9d27037a2624ff3d7
+  metadata.gz: 858af8b908494438e9fca696b3c2fcb6ed537bb1
+  data.tar.gz: 3bead42fccf5cb4b3c3d2b886a6582e4a49fdc90
 SHA512:
-  metadata.gz: 01474c3afa86dff4563647d07e21b0a21755a0a3f34075c7a02bfb082365b78a97d4976b2942c37455f7904faea633e6b288748806437db8f47770163f841fbc
-  data.tar.gz: 64d0a769989d2828567f8469abc2898fda61843d55a4daa2ce4995d002effcbef8da353d8d174b688f2a7d5aded2f87af95438ac9d562ccdb399b0e210b22df7
+  metadata.gz: e567683893133ea032c47a24eafbe4965aeb5b05816be09eb35a64736fffe51da6d160ea142385c4dcaa56ed7f0cc1d9c364dea34acbb10d855d0e2d7f41bd76
+  data.tar.gz: a6f8a4664fd0e7ccad28a6cb3c71efa263aa6f15e3272a1072561598a6dbd919b5219586d41d55f2cb689587a5969f8bfbda0237eab325bc154fc09c109318a9

data/Changes

@@ -1,5 +1,8 @@
 Revision history for Packager (ordered by revision number).
 
+0.1.3 Dec 01 2018
+   - [FEATURE] Add support for symbolic links.
+
 0.1.2 Nov 30 2018
    - [FEATURE] Add support for the following flags:
        * --before-install (aliased as --pre-install)

data/README.md

@@ -69,6 +69,15 @@ Consider providing helpers for the following:
    * `file` / `files`
       * `source` String
       * `dest`   String
+   * `link` / `links`
+      * `source` String
+      * `dest`   String
+      * `link`   Boolean
    * `requires` Array[String]
    * `provides` Array[String]
    * `before_install` Array[String]
+
+### Link
+
+If `link` is true in your file, then a symbolic link will be created instead of
+a file being copied.

data/lib/packager/dsl.rb

@@ -34,8 +34,9 @@ class Packager::DSL < DSL::Maker
   copy_file_dsl = generate_dsl({
     :source => String,
     :dest   => String,
+    :link   => Boolean,
   }) do
-    Packager::Struct::File.new(source, dest)
+    Packager::Struct::File.new(source, dest, link)
   end
 
   add_entrypoint(:package, {

data/lib/packager/executor.rb

@@ -4,21 +4,29 @@ require 'tmpdir'
 
 class Packager
   class Executor
-    attr_accessor :commands, :dryrun
+    attr_accessor :commands, :dryrun, :workdir
 
     def initialize(opts={})
       self.dryrun = !!opts[:dryrun]
       self.commands = []
     end
 
+    def with_workdir(&block)
+      if workdir
+        Dir.chdir(workdir, &block)
+      else
+        Dir.mktmpdir do |dir|
+          Dir.chdir(dir, &block)
+        end
+      end
+    end
+
     def execute_on(items)
       curdir = Dir.pwd
       items.collect do |item|
-        Dir.mktmpdir do |tempdir|
-          Dir.chdir(tempdir) do
-            path = create_package_for(item)
-            FileUtils.mv(path, curdir) if path
-          end
+        with_workdir do
+          path = create_package_for(item)
+          FileUtils.mv(path, curdir) if path
         end
       end
     end
@@ -28,7 +36,11 @@ class Packager
         item.files.each do |file|
           dest = (file.dest || '').gsub /^\//, ''
           FileUtils.mkdir_p File.dirname(dest)
-          FileUtils.cp_r(file.source, dest)
+          if file.link
+            FileUtils.ln_s(file.source, dest)
+          else
+            FileUtils.cp_r(file.source, dest)
+          end
         end
       end
 

data/lib/packager/struct.rb

@@ -36,7 +36,7 @@ class Packager::Struct < Struct
   end
 
   class File < Packager::Struct.new(
-    :source, :dest,
+    :source, :dest, :link,
   )
   end
 

data/lib/packager/version.rb

@@ -1,3 +1,3 @@
 class Packager
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/dsl/files_spec.rb

@@ -18,6 +18,7 @@ describe Packager::DSL do
       expect(items[0].files).to be_instance_of(Array)
       expect(items[0].files[0].source).to eq('foo')
       expect(items[0].files[0].dest).to eq('bar')
+      expect(items[0].files[0].link).to be_falsey
     end
 
     it "handles two files" do
@@ -42,5 +43,24 @@ describe Packager::DSL do
       expect(items[0].files[1].source).to eq('foo2')
       expect(items[0].files[1].dest).to eq('bar2')
     end
+
+    it "handles a link" do
+      items = parse_dsl {
+        package {
+          name 'foo'
+          version '0.0.1'
+          type 'test'
+          file {
+            source 'foo'
+            dest 'bar'
+            link true
+          }
+        }
+      }
+      expect(items[0].files).to be_instance_of(Array)
+      expect(items[0].files[0].source).to eq('foo')
+      expect(items[0].files[0].dest).to eq('bar')
+      expect(items[0].files[0].link).to be_truthy
+    end
   end
 end

data/spec/executor/context.rb

@@ -1,3 +1,5 @@
 RSpec.shared_context :executor do
-  subject(:executor) { Packager::Executor.new(:dryrun => true) }
+  subject(:executor) {
+    Packager::Executor.new(:dryrun => true)
+  }
 end

data/spec/executor/files_spec.rb

@@ -4,6 +4,10 @@ describe Packager::Executor do
   include_context :executor
   include_context :workdir
 
+  before(:each) {
+    executor.workdir = workdir
+  }
+
   it "creates a package with one file" do
     FileUtils.chdir(sourcedir) do
       FileUtils.touch('file1')
@@ -17,6 +21,34 @@ describe Packager::Executor do
         Packager::Struct::File.new(File.join(sourcedir, 'file1'), '/bar/file2'),
       ]
     )
+
+    executor.execute_on([item])
+
+    expect(executor.commands[0]).to eq(
+      Packager::Struct::Command.new({
+        :name => 'foo',
+        :version => '0.0.1',
+        :source => 'dir',
+        :target => 'test',
+        :directories => { 'bar' => true },
+      })
+    )
+    expect(File.exists?(File.join('bar', 'file2'))).to be_truthy
+  end
+
+  it "creates a package with one link" do
+    FileUtils.chdir(sourcedir) do
+      FileUtils.touch('file1')
+    end
+
+    item = Packager::Struct::Package.new(
+      :name => 'foo',
+      :version => '0.0.1',
+      :type => 'test',
+      :files => [
+        Packager::Struct::File.new(File.join(sourcedir, 'file1'), '/bar/file2', true),
+      ]
+    )
     FileUtils.chdir(workdir) do
       executor.execute_on([item])
     end
@@ -29,5 +61,8 @@ describe Packager::Executor do
         :directories => { 'bar' => true },
       })
     )
+
+    # Verify that /bar/file2 points to file1 as a symlink
+    expect(File.symlink?(File.join(workdir, 'bar', 'file2'))).to be_truthy
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packager-dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Rob Kinyon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dsl_maker