dr 0.1.6 → 0.1.7

data/lib/dr/gitpackage.rb

@@ -117,64 +117,79 @@ module Dr
       branch = @default_branch unless branch
 
       version = nil
+
       orig_rev, curr_rev = update_from_origin branch
-      if curr_rev != orig_rev || force
-        Dir.mktmpdir do |src_dir|
-          checkout branch, src_dir
+      log :info, "Branch #{branch.fg "blue"}, revision #{curr_rev[0..7].fg "blue"}"
+      unless @force
+        history.each do |v|
+          metadata = @repo.get_build_metadata @name, v
+          if metadata.has_key?("revision") && metadata["revision"] == curr_rev
+            msg = "This revision of #{@name.style "pkg-name"} has alredy " +
+                  "been built and is available as #{v.to_s.style "version"}"
+            log :info, msg
+            return
+          end
+        end
+      end
 
-          version = PkgVersion.new get_version "#{src_dir}/debian/changelog"
-          log :info, "Source version: #{version.source.style "version"}"
+      Dir.mktmpdir do |src_dir|
+        checkout branch, src_dir
 
-          while build_exists? version
-            version.increment!
-          end
-          log :info, "Build version: #{version.to_s.style "version"}"
-
-          log :info, "Updating changelog"
-          now = Time.new.strftime("%a, %-d %b %Y %T %z")
-          ch_entry = "#{@name} (#{version}) kano; urgency=low\n"
-          ch_entry << "\n"
-          ch_entry << "  * Package rebuilt, updated to revision #{curr_rev[0..7]}.\n"
-          ch_entry << "\n"
-          ch_entry << " -- Team Kano <dev@kano.me>  #{now}\n\n"
-
-          changelog = ""
-          File.open "#{src_dir}/debian/changelog", "r" do |f|
-            changelog = f.read
-          end
+        version = PkgVersion.new get_version "#{src_dir}/debian/changelog"
+        log :info, "Source version: #{version.source.style "version"}"
 
-          File.open "#{src_dir}/debian/changelog", "w" do |f|
-            f.write ch_entry
-            f.write changelog
-          end
+        while build_exists? version
+          version.increment!
+        end
+        log :info, "Build version: #{version.to_s.style "version"}"
+
+        log :info, "Updating changelog"
+        now = Time.new.strftime("%a, %-d %b %Y %T %z")
+        ch_entry = "#{@name} (#{version}) kano; urgency=low\n"
+        ch_entry << "\n"
+        ch_entry << "  * Package rebuilt, updated to revision #{curr_rev[0..7]}.\n"
+        ch_entry << "\n"
+        ch_entry << " -- Team Kano <dev@kano.me>  #{now}\n\n"
+
+        changelog = ""
+        File.open "#{src_dir}/debian/changelog", "r" do |f|
+          changelog = f.read
+        end
 
-          repo_arches = @repo.get_architectures
-          pkg_arches = get_architectures("#{src_dir}/debian/control")
-          arches = case
+        File.open "#{src_dir}/debian/changelog", "w" do |f|
+          f.write ch_entry
+          f.write changelog
+        end
+
+        repo_arches = @repo.get_architectures
+        pkg_arches = get_architectures("#{src_dir}/debian/control")
+        arches = case
           when pkg_arches.include?("any") || pkg_arches.include?("all")
             repo_arches
           else
             repo_arches & pkg_arches
           end
-          arches.each do |arch|
-            @repo.buildroot(arch).open do |br|
-              log :info, "Building the #{@name.style "pkg-name"} package " +
-                         "version #{version.to_s.style "version"} for #{arch}"
-
-              # Moving to the proper directory
-              build_dir_name = "#{@name}-#{version.upstream}"
-              build_dir = "#{br}/#{build_dir_name}"
-              FileUtils.cp_r src_dir, build_dir
-
-              # Make orig tarball
-              log :info, "Creating orig source tarball"
-              tar = "tar cz -C #{build_dir} --exclude=debian " +
-                    "-f #{br}/#{@name}_#{version.upstream}.orig.tar.gz " +
-                    "`ls -1 #{build_dir}`"
-              ShellCmd.new tar, :tag => "tar"
-
-              apt = "sudo chroot #{br} apt-get update"
-              deps = <<-EOS
+
+        arches.each do |arch|
+          @repo.buildroot(arch).open do |br|
+            log :info, "Building the #{@name.style "pkg-name"} package " +
+                       "version #{version.to_s.style "version"} for #{arch}"
+
+            # Moving to the proper directory
+            build_dir_name = "#{@name}-#{version.upstream}"
+            build_dir = "#{br}/#{build_dir_name}"
+            FileUtils.cp_r src_dir, build_dir
+
+            # Make orig tarball
+            files = Dir["#{build_dir}/*"].map { |f| "\"#{f}\"" }.join " "
+            log :info, "Creating orig source tarball"
+            tar = "tar cz -C #{build_dir} --exclude=debian " +
+                  "-f #{br}/#{@name}_#{version.upstream}.orig.tar.gz " +
+                  "#{files}"
+            ShellCmd.new tar, :tag => "tar"
+
+            apt = "sudo chroot #{br} apt-get update"
+            deps = <<-EOS
 sudo chroot #{br} <<EOF
 dpkg-source -b "/#{build_dir_name}"
 mk-build-deps *.dsc -i -t "apt-get --no-install-recommends -y"
@@ -188,49 +203,46 @@ debuild -i -uc -us -b
 EOF
 EOS
 
-              log :info, "Updating the sources lists"
-              ShellCmd.new apt, :tag => "apt-get", :show_out => true
+            log :info, "Updating the sources lists"
+            ShellCmd.new apt, :tag => "apt-get", :show_out => true
 
-              log :info, "Installing build dependencies"
-              ShellCmd.new deps, :tag => "mk-build-deps", :show_out => true
+            log :info, "Installing build dependencies"
+            ShellCmd.new deps, :tag => "mk-build-deps", :show_out => true
 
-              log :info, "Building the package"
-              ShellCmd.new build, :tag => "debuild", :show_out => true
+            log :info, "Building the package"
+            ShellCmd.new build, :tag => "debuild", :show_out => true
 
-              debs = Dir["#{br}/*.deb"]
-              expected_pkgs = get_subpackage_names "#{src_dir}/debian/control"
-              expected_pkgs.each do |subpkg_name|
-                includes = debs.inject(false) do |r, n|
-                  r || ((/^#{br}\/#{subpkg_name}_#{version}/ =~ n) != nil)
-                end
+            debs = Dir["#{br}/*.deb"]
+            expected_pkgs = get_subpackage_names "#{src_dir}/debian/control"
+            expected_pkgs.each do |subpkg_name|
+              includes = debs.inject(false) do |r, n|
+                r || ((/^#{br}\/#{subpkg_name}_#{version}/ =~ n) != nil)
+              end
 
-                unless includes
-                  log :err, "Subpackage #{subpkg_name} did not build properly"
-                  raise "Building #{name} failed"
-                end
+              unless includes
+                log :err, "Subpackage #{subpkg_name} did not build properly"
+                raise "Building #{name} failed"
               end
+            end
 
-              build_dir = "#{@repo.location}/packages/#{@name}/builds/#{version}"
-              FileUtils.mkdir_p build_dir
-              debs.each do |pkg|
-                FileUtils.cp pkg, build_dir
+            build_dir = "#{@repo.location}/packages/#{@name}/builds/#{version}"
+            FileUtils.mkdir_p build_dir
+            debs.each do |pkg|
+              FileUtils.cp pkg, build_dir
 
-                deb_filename = File.basename(pkg)
-                log :info, "Signing the #{deb_filename.style "subpkg-name"} package"
-                @repo.sign_deb "#{build_dir}/#{deb_filename}"
-              end
+              deb_filename = File.basename(pkg)
+              log :info, "Signing the #{deb_filename.style "subpkg-name"} package"
+              @repo.sign_deb "#{build_dir}/#{deb_filename}"
+            end
 
-              log :info, "Writing package metadata"
-              File.open "#{build_dir}/.metadata", "w" do |f|
-                YAML.dump({"branch" => branch}, f)
-              end
-              log :info, "The #{@name.style "pkg-name"} package has been " +
-                         "built successfully."
+            log :info, "Writing package metadata"
+            File.open "#{build_dir}/.metadata", "w" do |f|
+              YAML.dump({"branch" => branch, "revision" => curr_rev}, f)
             end
+            log :info, "The #{@name.style "pkg-name"} package was " +
+                       "built successfully."
           end
         end
-      else
-        log :info, "There were no changes in the #{@name.style "pkg-name"} package"
       end
       version
     end

data/lib/dr/version.rb

@@ -1,3 +1,3 @@
 module Dr
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: dr
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
+  prerelease: 
 platform: ruby
 authors:
 - Radek Pazdera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tco
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,37 +62,39 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  dr works with distribution-level packaging
-                            tools and helps you make and distribute your own
-                            Debian packages through your own repository.
-                            This is a super early release, certainly NOT ready
-                            for production.
+description: ! "dr works with distribution-level packaging\n                          tools
+  and helps you make and distribute your own\n                          Debian packages
+  through your own repository.\n                          This is a super early release,
+  certainly NOT ready\n                          for production."
 email:
 - radek@kano.me
 executables:
@@ -116,26 +125,27 @@ files:
 homepage: http://github.com/KanoComputing/kano-package-system
 licenses:
 - GPLv2
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: dr stands for debian-repository. It is a packaging tool that helps you make,
   distribute and maintain you own disto packages and repositories. It's in a very
   early stage, NOT READY for production.

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a853b8d13242f1b101720affa5ed4a47ca70ca83
-  data.tar.gz: a08d2d29dc77d00cc9e14fa260e5c62a160ce5ee
-SHA512:
-  metadata.gz: c47cbc373eca126e7956b2b1b39d53434e3cca6cc2c8a5655ae66a844ebf1e6d14162a0e53452f8c754924c4f9c659f9bb0788103330147a412e6c7b58a467b1
-  data.tar.gz: a0ab608937f6065e8604b2296ad1b50ea2317e88c3c65e4ee915e5ed761b7eb67285f2fc50267fc25198a321a0b9974ac6794288758d8ee391035ed2b85848a8