rake_fly 0.18.0.pre.pre.4 → 0.18.0.pre.pre.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e734086f59e9e572d0d63015ff2633805716b74bb16a72c894a4ce1a4fafdbc8
-  data.tar.gz: b6e89a979b6ec9db228be4eeccb5f626f71c3ba2c7e7c5eba6cb17366c8457dd
+  metadata.gz: 3ca68e316f79b3698b0834ca5307b1a21304864777f2e565cdc5f938e5879fd6
+  data.tar.gz: 600c757acd98f087f0a05c3e26a38d3ec7a4abbd03e02d1f62c661cbfb337dbe
 SHA512:
-  metadata.gz: ab68b2036f749fae416da8661638941844e3c2492477a5fb8d3cc38abaf1ed7f82d33bbd7d4ef7eec12e987467a50dece6feca02dbbbd9acdd7655e19976c5b7
-  data.tar.gz: cd74dd020e2b783a21d268e729cdc4eb0a5fb738cf730f6d322847cba529620a5b09f966624db8501feabbe42a67ec7c4f8fa41958a6bd7cc1db8eb8df77bf1d
+  metadata.gz: 42b87d82bed9ba60255c41aae450f649798531a69b1ffe77d597291dc7cef72935fd6863dcb288111fdf9f7f36b98ddf14c2a3931450a7ffec0f8da88effef1f
+  data.tar.gz: 52d4c1f38c35f03a4e2ecda0f3dd84afe317c0da165cf6daaccad20001fa3600b04235181fccc7fa8c727a1de50d773e4c85a78697a50a4f1095347f20398e99

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    rake_fly (0.18.0.pre.pre.4)
+    rake_fly (0.18.0.pre.pre.5)
       rake_dependencies (~> 0.19)
       ruby_fly (~> 0.5)
+      semantic (~> 1.5.0)
 
 GEM
   remote: https://rubygems.org/
@@ -26,13 +27,13 @@ GEM
     lino (1.1.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
-    minitar (0.7)
+    minitar (0.8)
     minitest (5.11.3)
     open4 (1.3.4)
     rake (12.3.1)
-    rake_dependencies (0.19.0)
+    rake_dependencies (0.23.0)
       hamster (~> 3.0)
-      minitar (~> 0.6)
+      minitar (~> 0.7)
       rubyzip (>= 1.2.2)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -47,9 +48,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    ruby_fly (0.5.0)
+    ruby_fly (0.9.0)
       lino (~> 1.1)
-    rubyzip (1.2.2)
+    rubyzip (1.2.3)
+    semantic (1.5.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -64,7 +66,7 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 5.2)
-  bundler (~> 1.17)
+  bundler (~> 2.0.2)
   fakefs (~> 0.18)
   gem-release (~> 2.0)
   rake (~> 12.3)
@@ -73,4 +75,4 @@ DEPENDENCIES
   simplecov (~> 0.16)
 
 BUNDLED WITH
-   1.17.3
+   2.0.2

data/lib/rake_fly.rb

@@ -1,9 +1,12 @@
+require 'semantic'
 require 'rake_dependencies'
 require 'ruby_fly'
 require 'rake_fly/version'
 require 'rake_fly/tasklib'
 require 'rake_fly/tasks'
 
+BREAKING_VERSION = '5.0.0'
+
 module RakeFly
   include RubyFly
 
@@ -15,19 +18,18 @@ module RakeFly
     RubyFly.configure do |c|
       c.binary = File.join(path, 'bin', 'fly')
     end
+
     RakeDependencies::Tasks::All.new do |t|
       t.namespace = namespace
       t.dependency = 'fly'
       t.version = version
       t.path = path
-      t.type = :tgz
+      t.type = self.type(version)
 
       t.os_ids = {mac: 'darwin', linux: 'linux'}
 
-      t.uri_template = "https://github.com/concourse/concourse/releases/download" +
-                          "/v<%= @version %>" + 
-                          "/fly-<%= @version %>-<%= @os_id %>-amd64<%= @ext %>"
-      t.file_name_template = "fly-<%= @version %>-<%= @os_id %>-amd64<%= @ext %>"
+      t.uri_template = self.uri_template(version)
+      t.file_name_template = self.file_name_template(version)
 
       t.needs_fetch = lambda do |parameters|
         fly_binary = File.join(
@@ -37,4 +39,38 @@ module RakeFly
       end
     end
   end
+
+  private
+
+  def self.new_format?(version)
+    Semantic::Version.new(version) >= 
+      Semantic::Version.new(BREAKING_VERSION)
+  end
+
+  def self.type(version)
+    if self.new_format?(version)
+      :tgz
+    else
+      :uncompressed
+    end
+  end
+
+  def self.uri_template(version)
+    if new_format?(version)
+      "https://github.com/concourse/concourse/releases/download" +
+      "/v<%= @version %>" + 
+      "/fly-<%= @version %>-<%= @os_id %>-amd64<%= @ext %>"
+    else
+      "https://github.com/concourse/concourse/releases/" +
+      "download/v<%= @version %>/fly_<%= @os_id %>_amd64"
+    end
+  end
+
+  def self.file_name_template(version)
+    if new_format?(version)
+      "fly-<%= @version %>-<%= @os_id %>-amd64<%= @ext %>"
+    else
+      "fly_<%= @os_id %>_amd64"
+    end
+  end
 end

data/lib/rake_fly/version.rb

@@ -1,3 +1,3 @@
 module RakeFly
-  VERSION = '0.18.0-pre.4'
+  VERSION = '0.18.0-pre.5'
 end

data/rake_fly.gemspec

@@ -27,8 +27,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rake_dependencies', '~> 0.19'
   spec.add_dependency 'ruby_fly', '~> 0.5'
+  spec.add_dependency 'semantic', '~> 1.5.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'bundler', '~> 2.0.2'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec', '~> 3.8'
   spec.add_development_dependency 'gem-release', '~> 2.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake_fly
 version: !ruby/object:Gem::Version
-  version: 0.18.0.pre.pre.4
+  version: 0.18.0.pre.pre.5
 platform: ruby
 authors:
 - Toby Clemson
@@ -38,20 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: semantic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement