rake_fly 1.0.0.pre.pre.2 → 1.0.0.pre.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faf04c5965bfc819720056b0d78d928340210998739c1b9e634a08c312df08bd
-  data.tar.gz: 5c5e39400167ea92303ee7aac693fa5dbfbfa8827039123a751fe99437b78e42
+  metadata.gz: b258204e82c8df0e568745ef483a0618ee1961cafb77c73d7838b13651fea3c8
+  data.tar.gz: a893b5213c8e19e5d08600e7aec323a90bdf99e75c73aa8e2ac5d95a037c5ea8
 SHA512:
-  metadata.gz: 435a7c9170cf11ebc6528fc9b781b16dbb0a8b8e05e63778439d0ce6796c61ef8cd76d83b68f2361053793ebc581d43af62dc6c29fab0719abeb4946b2e8a472
-  data.tar.gz: ce868f657e0ab3c24de87010ae86f74d0a7ac998414af47f5602d31c9873755efd9b8a7e9febe497d2508f0b2a7cbb0eb27a6c2275cf9fb6caad2f68aa5f94c0
+  metadata.gz: 8626c5cdf8a5a9c4204933df45f1a4943db150823593679a26aaef0661c572047b91847af4edbc4c72011969293f054bfe0e93ebea2c2b52b9a504746984baff
+  data.tar.gz: fa484766cd9705f332b1dd5780ea6433091c927e3e3cd6f0f3db0d4442cc91a1fe4979d93a8b3937b25609ad48d546d0e2105e39b30d3163d34b5fb159e262ba

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    rake_fly (1.0.0.pre.pre.2)
-      rake_dependencies (~> 1.4)
+    rake_fly (1.0.0.pre.pre.3)
+      rake_dependencies (~> 1.6)
+      rake_factory (~> 0.11)
       ruby_fly (~> 0.11)
       semantic (~> 1.6.1)
 
@@ -31,12 +32,12 @@ GEM
     minitest (5.14.0)
     open4 (1.3.4)
     rake (13.0.1)
-    rake_dependencies (1.4.0)
+    rake_dependencies (1.6.0)
       hamster (~> 3.0)
       minitar (~> 0.9)
-      rake_factory (~> 0.8)
+      rake_factory (~> 0.11)
       rubyzip (~> 2.0)
-    rake_factory (0.8.0)
+    rake_factory (0.11.0)
       activesupport (~> 5.2)
       rake (~> 13.0)
     rspec (3.9.0)

data/README.md

@@ -61,7 +61,7 @@ openssl aes-256-cbc \
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at 
-https://github.com/tobyclemson/rake_fly. This project is intended to be a 
+https://github.com/infrablocks/rake_fly. This project is intended to be a 
 safe, welcoming space for collaboration, and contributors are expected to 
 adhere to the [Contributor Covenant](http://contributor-covenant.org) code of 
 conduct.

data/lib/rake_fly/task_sets/pipeline.rb

@@ -22,11 +22,14 @@ module RakeFly
       parameter :unpause_pipeline_task_name, :default => :unpause_pipeline
       parameter :push_pipeline_task_name, :default => :push_pipeline
 
-      task Tasks::GetPipeline, name: ->(ts) { ts.get_pipeline_task_name }
-      task Tasks::SetPipeline, name: ->(ts) { ts.set_pipeline_task_name }
+      task Tasks::GetPipeline,
+          name: ->(ts) { ts.get_pipeline_task_name }
+      task Tasks::SetPipeline,
+          name: ->(ts) { ts.set_pipeline_task_name }
       task Tasks::UnpausePipeline,
           name: ->(ts) { ts.unpause_pipeline_task_name }
-      task Tasks::PushPipeline, name: ->(ts) { ts.push_pipeline_task_name }
+      task Tasks::PushPipeline,
+          name: ->(ts) { ts.push_pipeline_task_name }
     end
   end
 end

data/lib/rake_fly/version.rb

@@ -1,3 +1,3 @@
 module RakeFly
-  VERSION = '1.0.0-pre.2'
+  VERSION = '1.0.0-pre.3'
 end

data/lib/rake_fly.rb

@@ -20,40 +20,54 @@ module RakeFly
     file_name_template = self.file_name_template(version)
     new_format = self.new_format?(version)
 
+    task_set_opts = {
+        namespace: namespace,
+        dependency: 'fly',
+        version: version,
+        path: path,
+        type: type,
+        os_ids: {mac: 'darwin', linux: 'linux'},
+        uri_template: uri_template,
+        file_name_template: file_name_template,
+        needs_fetch: lambda { |t|
+          fly_binary = File.join(t.path, t.binary_directory, 'fly')
+
+          !(File.exist?(fly_binary) && RubyFly.version == version)
+        }}
+
+    unless new_format
+      task_set_opts[:source_binary_name_template] = "fly_<%= @os_id %>_amd64"
+      task_set_opts[:target_binary_name_template] = "fly"
+    end
+
     RubyFly.configure do |c|
       c.binary = File.join(path, 'bin', 'fly')
     end
 
-    RakeDependencies::TaskSets::All.define do |ts|
-      ts.namespace = namespace
-      ts.dependency = 'fly'
-      ts.version = version
-      ts.path = path
-      ts.type = type
-
-      ts.os_ids = {mac: 'darwin', linux: 'linux'}
-
-      ts.uri_template = uri_template
-      ts.file_name_template = file_name_template
-
-      unless new_format
-        ts.source_binary_name_template = "fly_<%= @os_id %>_amd64"
-        ts.target_binary_name_template = "fly"
-      end
-
-      ts.needs_fetch = lambda do |t|
-        fly_binary = File.join(t.path, t.binary_directory, 'fly')
+    RakeDependencies::TaskSets::All.define(task_set_opts)
+  end
 
-        !(File.exist?(fly_binary) && RubyFly.version == version)
-      end
+  def self.define_pipeline_tasks(opts = {}, &block)
+    task_names = opts[:task_names]
+    if task_names
+      opts[:get_pipeline_task_name] ||=
+          task_names[:get_pipeline] if task_names[:get_pipeline]
+      opts[:set_pipeline_task_name] ||=
+          task_names[:set_pipeline] if task_names[:set_pipeline]
+      opts[:unpause_pipeline_task_name] ||=
+          task_names[:unpause_pipeline] if task_names[:unpause_pipeline]
+      opts[:push_pipeline_task_name] ||=
+          task_names[:push_pipeline] if task_names[:push_pipeline]
     end
+
+    RakeFly::TaskSets::Pipeline.define(opts, &block)
   end
 
   private
 
   def self.new_format?(version)
     Semantic::Version.new(version) >=
-      Semantic::Version.new(ARTIFACT_FORMAT_CHANGE_VERSION)
+        Semantic::Version.new(ARTIFACT_FORMAT_CHANGE_VERSION)
   end
 
   def self.type(version)
@@ -67,11 +81,11 @@ module RakeFly
   def self.uri_template(version)
     if new_format?(version)
       "https://github.com/concourse/concourse/releases/download" +
-      "/v<%= @version %>" + 
-      "/fly-<%= @version %>-<%= @os_id %>-amd64<%= @ext %>"
+          "/v<%= @version %>" +
+          "/fly-<%= @version %>-<%= @os_id %>-amd64<%= @ext %>"
     else
       "https://github.com/concourse/concourse/releases/" +
-      "download/v<%= @version %>/fly_<%= @os_id %>_amd64"
+          "download/v<%= @version %>/fly_<%= @os_id %>_amd64"
     end
   end
 

data/rake_fly.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'rake_dependencies', '~> 1.4'
+  spec.add_dependency 'rake_dependencies', '~> 1.6'
+  spec.add_dependency 'rake_factory', '~> 0.11'
   spec.add_dependency 'ruby_fly', '~> 0.11'
   spec.add_dependency 'semantic', '~> 1.6.1'
 

data/scripts/ci/steps/prerelease.sh

@@ -9,12 +9,7 @@ PROJECT_DIR="$( cd "$SCRIPT_DIR/../../.." && pwd )"
 
 cd "$PROJECT_DIR"
 
-git status
-
 ./go version:bump[pre]
-
-git status
-
 ./go release
 
 git status

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake_fly
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.pre.2
+  version: 1.0.0.pre.pre.3
 platform: ruby
 authors:
 - Toby Clemson
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake_factory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: ruby_fly
   requirement: !ruby/object:Gem::Requirement