mina-circle 1.4.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 564af880f7175c4b7f2f5d2b4bf3d48717e40d33
-  data.tar.gz: 7c32699c141eda87c7e11d497174961c7c3711ad
+  metadata.gz: c284a694ea4fb03205583c0faf93717b8c7c1d50
+  data.tar.gz: 70712c058c5f0fcd874151dcd094ae8cb208773a
 SHA512:
-  metadata.gz: 534006608e15d9998887a0fdc905b47dc5033681368257b04a6691c442ecb38e989b4baecd55987f38d28c63481ed21fb8814d11cf3a5a75db3ab745554ae2fd
-  data.tar.gz: 9843d874c5e77c4338e0696bd8421ddbea0ecb81688e7800fb91fe297ae02c2672e49fb9b08110c701c2a962ec1b83cfae50feb83723f150ff6fa06b0a1129a7
+  metadata.gz: 1bd3f9fbf9a60b63114f86261064837273892f460e2f0d0e7ea5b1c108830d643f3c2496ad6d7a19197e889eeb4177e3b596dff11ec25ec4f6828c1002a8dacf
+  data.tar.gz: 41fd371865b03df7dd201f44a91c0c09197ed1cf77a5079ce8230b240420c1c7c10be9b846d36657477795ba58b02034d60174267d32af42ab8f5cded7a08fc7

data/lib/mina-circle.rb

@@ -1,7 +1,10 @@
 require 'mina-circle/version'
 require 'mina-circle/helpers'
 require 'mina-circle/tasks'
+require 'mina-circle/curl_command'
 require 'mina-circle/circle-ci/circle_ci'
 require 'mina-circle/circle-ci/client'
 require 'mina-circle/circle-ci/artifact'
+require 'mina-circle/circle-ci/build'
 require 'mina-circle/circle-ci/project'
+

data/lib/mina-circle/circle-ci/build.rb

@@ -0,0 +1,23 @@
+class CircleCI::Build
+  attr_reader :job_name, :build_number, :status, :project
+  def initialize(hash, project)
+    @job_name = hash['workflows']['job_name']
+    @build_number = hash['build_num']
+    @status = hash['status']
+    @project = project
+  end
+
+  def artifacts
+    api_path = [
+      'project',
+      project.vcs_type,
+      project.organization,
+      project.name,
+      build_number,
+      'artifacts'
+    ].join '/'
+    client = CircleCI::Client.instance
+    response = client.get(api_path)
+    response.collect { |artifact| CircleCI::Artifact.new artifact }
+  end
+end

data/lib/mina-circle/circle-ci/project.rb

@@ -1,19 +1,10 @@
 class CircleCI::Project
   attr_writer :artifacts
-  attr_reader :vcs_type, :organization, :name, :branch
-  def initialize(organization:, name:, branch:, vcs_type: 'github')
+  attr_reader :vcs_type, :organization, :name
+  def initialize(organization:, name:, vcs_type: 'github')
     @organization = organization
     @name = name
     @vcs_type = vcs_type
-    @branch = branch
-  end
-
-  def artifacts
-    @artifacts ||= fetch_artifacts
-  end
-
-  def api_path
-    api_path_parts.join('/')
   end
 
   def build_path
@@ -22,32 +13,28 @@ class CircleCI::Project
     parts.compact.join('/')
   end
 
+  def recent_builds(branch)
+    client = CircleCI::Client.instance
+    path = api_path branch
+    response = client.get path
+    builds = response.collect { |build| CircleCI::Build.new(build, self) }
+    builds.compact
+  end
+
   private
 
-  def api_path_parts
+  def api_path(branch)
     [
       'project',
       vcs_type,
       organization,
-      name
-    ]
+      name,
+      'tree',
+      branch
+    ].join('/')
   end
 
   def real_branch
     branch || 'master'
   end
-
-  def fetch_artifacts
-    # To support Circle 2.0
-    builds = CircleCI::Client.instance.get "#{build_path}", filter: 'successful', has_artifacts: true
-    builds = builds.sort { |a, b| b['build_num'] - a['build_num'] }
-    build_num = builds.first['build_num']
-
-    puts "Using Build: #{build_num}"
-
-    artifact_hashes = CircleCI::Client.instance.get "#{api_path}/#{build_num}/artifacts", filter: 'successful', branch: real_branch
-    artifact_hashes.collect { |artifact_hash|
-      CircleCI::Artifact.new artifact_hash
-    }
-  end
 end

data/lib/mina-circle/curl_command.rb

@@ -0,0 +1,21 @@
+class CurlCommand
+  attr_reader :artifact_url, :output_file_name, :api_key, :follow_redirects
+  def initialize(artifact_url, output_file_name, api_key, follow_redirects = true)
+    @artifact_url = artifact_url
+    @output_file_name = output_file_name
+    @api_key = api_key
+    @follow_redirects = follow_redirects
+  end
+
+  def follow_redirects?
+    !!follow_redirects
+  end
+
+  def authenticated_artifact_url
+    "#{artifact_url}?circle-token=#{api_key}"
+  end
+  
+  def to_s
+    "curl #{follow_redirects? ? '-L' : ''} -o #{output_file_name} #{authenticated_artifact_url}"
+  end
+end

data/lib/mina-circle/helpers.rb

@@ -1,12 +1,25 @@
 require 'uri'
 module MinaCircle
   module Helpers
-    def artifact_url
-      options = settings.select { |k,v|
-        k.to_s.start_with? artifact_source.to_s.downcase or
-          options_whitelist.include? k
-      }
-      Module.const_get(artifact_source.to_s).artifact_url(options)
+    def artifact_fetch_command
+      project = CircleCI::Project.new(
+        organization: settings[:circleci_user],
+        name: settings[:circleci_project]
+      )
+
+      recent_builds = project.recent_builds settings[:branch]
+
+      successful_for_job =
+        recent_builds
+          .select { |build| build.status == 'success' && build.job_name == settings[:circleci_job_name] }
+          .sort { |a, b| a.build_number <=> b.build_number }
+
+      build_artifacts = successful_for_job.last.artifacts
+
+      deploy_artifact = build_artifacts.find { |artifact| artifact.filename == settings[:circleci_artifact] }
+      api_token = CircleCI::Client.instance.api_token
+      curl = CurlCommand.new deploy_artifact.url, settings[:circleci_artifact], api_token
+      curl.to_s
     rescue RuntimeError => e
       puts "Unable to determine url for deployment artifact"
       puts e.message

data/lib/mina-circle/tasks.rb

@@ -17,8 +17,6 @@ extend MinaCircle::Helpers
 # ### circleci_explode_command
 # Command with options for decompressing the artifact archive
 
-set :artifact_source, :CircleCI
-
 namespace :mina_circle do
   desc 'Downloads and explodes the archive file containing the build'
   task :deploy do
@@ -37,7 +35,7 @@ namespace :mina_circle do
     end
 
     print_str "[mina-circle] Fetching: #{circleci_artifact}"
-    queue echo_cmd("curl -o #{circleci_artifact} #{artifact_url}")
+    queue echo_cmd(artifact_fetch_command)
     queue echo_cmd("#{circleci_explode_command} #{circleci_artifact}")
     queue echo_cmd("rm #{circleci_artifact}")
   end

data/lib/mina-circle/version.rb

@@ -1,3 +1,3 @@
 module MinaCircle
-  VERSION = '1.4.2'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina-circle
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Patrick Simpson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-15 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina
@@ -81,9 +81,11 @@ extra_rdoc_files: []
 files:
 - lib/mina-circle.rb
 - lib/mina-circle/circle-ci/artifact.rb
+- lib/mina-circle/circle-ci/build.rb
 - lib/mina-circle/circle-ci/circle_ci.rb
 - lib/mina-circle/circle-ci/client.rb
 - lib/mina-circle/circle-ci/project.rb
+- lib/mina-circle/curl_command.rb
 - lib/mina-circle/helpers.rb
 - lib/mina-circle/tasks.rb
 - lib/mina-circle/version.rb
@@ -107,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Deploy your application from artifacts produced by CircleCI