buildtasks 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5879afcde9bdcb15af3a1e7f184f6a6f970da13d
-  data.tar.gz: 8334ffcd146bb1dd3034fb8733e8cf0772b2654d
+  metadata.gz: 23eaf60ec0b87d7301075cdd8d8fd1ae83c495a5
+  data.tar.gz: 6b9bebfc6efec80deb7f4b99709c27e926ab75a8
 SHA512:
-  metadata.gz: 3c9bd07cc8289ecbc106f4c766cf40732da829e7fcf1c3bda42f228f1e3f495c2690eb6b1aad69895ce85c1bfa31076b42789ffc9455a2c5dd85c87b59928969
-  data.tar.gz: 88eb7463a3f55bf40bab5d3c7c7f615b3622f4dfa40f3711751331661d098a039169ffb015f30b6954d54225d7cd0d20605d0b678167df7ebc14e9efd65365e9
+  metadata.gz: 02b5373852bd82509252793a3449443f9bc14701036c3ca61a426b90ed067ce85011fbfcb7804783da109b87d1f1ed7124862b82938335ce26dbca5abd9f4849
+  data.tar.gz: 4599087186e724688620ef8ba72ef4e1baf2d0d624ebaca23db1da76347c1e4d95a2ec68a9f430259e5238480a5e21fbd5c17b45d8e1f46eeaf1dd136e33c486

data/lib/buildtasks/git_buildpackage/tasks.rb

@@ -86,9 +86,10 @@ module BuildTasks
         desc "Build packages"
         task :build => [:clone, :patch, :deps] do
           in_git_dir do
-            sh "git-buildpackage", "--git-ignore-branch",
-                                   "--git-ignore-new",
-                                   "--git-builder=#{BUILD_CMD}"
+            cmd = gbp_cmd + ["--git-ignore-branch",
+                             "--git-ignore-new",
+                             "--git-builder=#{BUILD_CMD}"]
+            sh(*cmd)
           end
         end
 
@@ -115,6 +116,14 @@ module BuildTasks
       def in_git_dir
         cd(git_dir) { yield }
       end
+
+      def gbp_cmd
+        path = `which git-buildpackage`
+        return [path.strip] if $CHILD_STATUS.success?
+        path = `which gbp`
+        return [path.strip, "buildpackage"] if $?.success?
+        raise "git-buildpackage command not found"
+      end
     end
   end
 end

data/lib/buildtasks/version.rb

@@ -1,3 +1,3 @@
 module BuildTasks
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildtasks
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Mathias Lafeldt