release_tagger 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b097254542e2fc3d1a364a7862242f6b0c090dd
-  data.tar.gz: f2aded664428fda3dee0e887c8b29ccfee07f590
+  metadata.gz: 1dd7fc6bfa899294769597fe1f7399648a80a6ed
+  data.tar.gz: 80c15d85980194be4598b455f823277d7b27de2b
 SHA512:
-  metadata.gz: 9dcb31c9eab4e9df7241ce1bb546f520c2da0eaac9689d213638d3c22d72eb7c9371da0d8d0b5cf8adeafc03959cb7b38c65beccff76bd0885720c7e1366e843
-  data.tar.gz: b41b19afd2395f9f15086c1cdf08929324530115a7b75cab8a83e649703d48ed5a1bf5f952fb9f84094e91adfde687a1aeb6eb397dbd4acfa8847b016831d1e5
+  metadata.gz: fb2c9044cfeff40349cee2730224ed02be900ee92f4dd0dcd24718c3a39480e25c6005584ab158bfb9f4abd06dd91bc070abc0f8a8aa52e9f86a1d89aa49b089
+  data.tar.gz: 59dcbb84de01abeaeee2682ccf5d0583a0c6d1d06babb9b7a16cca7b3e293d44ad92322af248cb28cd6380b6009f43d76c894d48ee71488c6b3c607bb8eae906

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/release_tagger/repo.rb

@@ -7,7 +7,8 @@ module ReleaseTagger
     PACKAGECLOUD_ACCOUNT = 'lostmyname'
     REPO = 'qa'
     ITEMS_PER_PAGE = 1000
-    VERSIONS_URL = "https://packagecloud.io/api/v1/repos/#{PACKAGECLOUD_ACCOUNT}/#{REPO}/package/rpm/el/7/%s/x86_64/versions.json?per_page=#{ITEMS_PER_PAGE}"
+    ARCHS = %w(noarch x86_64)
+    VERSIONS_URL = "https://packagecloud.io/api/v1/repos/#{PACKAGECLOUD_ACCOUNT}/#{REPO}/package/rpm/el/7/%s/%s/versions.json?per_page=#{ITEMS_PER_PAGE}"
 
     def get_api_token
       home_config_file = Pathname.new(File.join(File.expand_path('~'), '.release_tagger', 'packagecloud_token'))
@@ -32,13 +33,13 @@ Consider setting your packagecloud api token in any of:
       package_cloud_api_token
     end
 
-    def get_max_package_version(package_name)
+    def get_json_response(url)
       pc_api_token = get_api_token
-      uri = URI.parse(VERSIONS_URL % package_name)
+      uri = URI.parse(url)
       req = Net::HTTP::Get.new(uri)
       req.basic_auth pc_api_token, ''
       response = Net::HTTP.start(uri.hostname, uri.port, :use_ssl => uri.scheme == 'https') {|http| http.request(req)}
-
+      puts url
       unless response.is_a?(Net::HTTPOK)
         puts "Error trying to get latest version of package #{package_name}"
         puts response.code
@@ -46,10 +47,20 @@ Consider setting your packagecloud api token in any of:
       end
 
       res = JSON.parse(response.body)
-      release_version = '1.0.0'
-      unless res == []
-        latest_package = res.select { |package| package['name'] == package_name}.max_by{ |package| package['version']}
-        release_version = latest_package['version']
+      res
+
+    end
+
+    def get_max_package_version(package_name)
+      release_version = '0.0.0'
+      ARCHS.each do |arch|
+        res = get_json_response(VERSIONS_URL % [package_name, arch])
+        unless res == []
+          latest_package = res.select { |package| package['name'] == package_name}.max_by{ |package| package['version']}
+          if Gem::Version.new(latest_package['version']) > Gem::Version.new(release_version)
+            release_version = latest_package['version']
+          end
+        end
       end
       release_version
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: release_tagger
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Simon Coffey