buildrdeb 1.0.0 → 1.0.1

data/buildrdeb.gemspec

@@ -16,7 +16,7 @@
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildrdeb'
-  spec.version        = '1.0.0'
+  spec.version        = '1.0.1'
   spec.author         = 'Antoine Toulme'
   spec.email          = "antoine@lunar-ocean.com"
   spec.homepage       = "http://buildr.apache.org/"

data/lib/buildrdeb/package.rb

@@ -36,11 +36,16 @@ module BuildrDeb
           raise "Cannot find #{filename}: #{file} doesn't exist" if !File.exists? file
           target = File.join(root, "DEBIAN", filename)
           contents = File.read(file)
-          # Replace version if we are looking at control.
-          contents.gsub!(/^Version: .*$/, "Version: #{@version}") if (filename == "control" && !@version.nil?)
-          File.open(target, "w+") {|t|
-            t.write eval("\"#{contents}\"")
-          }
+          # Replace version and use ERB to evaluate the control file, in case there are variables to pass.
+          if (filename == "control" && !@version.nil?)
+            contents.gsub!(/^Version: .*$/, "Version: #{@version}") 
+            File.open(target, "w") {|t|
+              t.write ERB.new(contents).result
+            }
+          else
+            cp file.to_s, target
+          end
+          
           File.chmod 0755, target
         end
       end

data/spec/buildrdeb/package_spec.rb

@@ -40,6 +40,28 @@ Description: The description can contain free-form text
              More descriptive text.
 CONTROL
     Buildr::write "control2", ""
+    Buildr::write "control3", <<-CONTROL
+Package: acme
+Version: 1.0
+Section: <%= MY_CUSTOM_VALUE %> 
+Priority: optional
+Architecture: all
+Essential: no
+Depends: libwww-perl, acme-base (>= 1.2)
+Pre-Depends: perl 
+Recommends: mozilla | netscape  
+Suggests: docbook 
+Installed-Size: 1024
+Maintainer: Joe Brockmeier <jzb@dissociatedpress.net>
+Conflicts: wile-e-coyote
+Replaces: sam-sheepdog
+Provides: acme
+Description: The description can contain free-form text
+             describing the function of the program, what
+             kind of features it has, and so on.
+             More descriptive text.
+CONTROL
+    
     Buildr::write "postinst", ""
     Buildr::write "prerm", ""
     Buildr::write "postinst2", <<-POSTINST2
@@ -130,19 +152,19 @@ POSTINST2
     File.read("target/foo-2.0.deb-contents/DEBIAN/control").should match /^Version: 2.0$/
   end
   
-  it "should evaluate the contents of the file" do
+  it "should evaluate the contents of the control file" do
     write_files
     define("foo", :version => "2.0") do
       project.package(:deb).tap do |deb|
-        deb.control = _("control")
-        deb.postinst = _("postinst2")
+        deb.control = _("control3")
+        deb.postinst = _("postinst")
         deb.prerm = _("prerm")
       end
     end
     MY_CUSTOM_VALUE = "custom"
     project("foo").package(:deb).invoke
     File.exists?( project("foo").package(:deb).to_s).should be_true
-    File.exists?("target/foo-2.0.deb-contents/DEBIAN/postinst").should be_true
-    File.read("target/foo-2.0.deb-contents/DEBIAN/postinst").should match MY_CUSTOM_VALUE
+    File.exists?("target/foo-2.0.deb-contents/DEBIAN/control").should be_true
+    File.read("target/foo-2.0.deb-contents/DEBIAN/control").should match MY_CUSTOM_VALUE
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: buildrdeb
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Antoine Toulme
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-25 00:00:00 -07:00
+date: 2010-10-08 00:00:00 -07:00
 default_executable: 
 dependencies: []