mina-circle 1.4.0 → 3.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5b24a4c6e3a4b0fac490634f87c07b44d18a8b22
-  data.tar.gz: 2998dcb6f40bfcc4ed2443a8161677e0cc668bb6
+SHA256:
+  metadata.gz: 546110a39af0be56b00c1e981dd2dd9b1af2f5ea80eb159fc822788994394b5b
+  data.tar.gz: 6ab1c740d9d7bf28f58c4894673cd8d2809f2cedb0430851e2e27536b5646e37
 SHA512:
-  metadata.gz: 2140e0f606001221f316c86db74f79bdeb819108b20433d3089b0891ddc882d0bc799e1e391c950a224a8ac7cd5fcb658c96cecefd0dc808d40102d47bd21cf3
-  data.tar.gz: 7cd5adf6327286fd21c886ecc5f3817901a8b4b40cce5fbafd3b66e3ec410f35c1eadefedba8d3a0813f46279a1053928a954d95960acad4bde4e4f76296b1cf
+  metadata.gz: 4772a7fd3b316f1c7623abb87da3674c6ba3318f49884bb09b42f91ca589e9897524cae767d9281ee1dc9c54fed79408da3ef305766c2b7a22f66cb8ff23950f
+  data.tar.gz: 07f7adbc92a598895e205a69d12dec4c1237a4d6773853efac90e0cede4db69cc0783b214a1d1037c239572eecd8c37be59e8b6d2ada6bd8a3c9693c327cc18b

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.dig '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,43 +1,40 @@
 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
+  def build_path
+    parts = api_path_parts + ['tree', real_branch]
+      
+    parts.compact.join('/')
   end
 
-  def api_path
+  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(branch)
     [
       'project',
       vcs_type,
       organization,
-      name
+      name,
+      'tree',
+      branch
     ].join('/')
   end
 
-  private
-
-  def fetch_artifacts
-    # To support Circle 2.0
-    build_info = CircleCI::Client.instance.get "#{api_path}", filter: 'successful', branch: branch ? branch : 'master', has_artifacts: true
-
-    build_num = 'latest' # circle version 1.0
-
-    if build_info.first['previous_successful_build']['build_num']
-      build_num = build_info.first['previous_successful_build']['build_num']
-    end
-
-    puts "Using Build: #{build_num}"
-
-    artifact_hashes = CircleCI::Client.instance.get "#{api_path}/#{build_num}/artifacts", filter: 'successful', branch: branch ? branch : 'master'
-    artifact_hashes.collect { |artifact_hash|
-      CircleCI::Artifact.new artifact_hash
-    }
+  def real_branch
+    branch || 'master'
   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,30 @@
 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(settings)
+      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 }
+
+      if successful_for_job.empty?
+        STDERR.puts 'No successful builds for this branch and job name'
+        exit 1
+      end
+
+      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,28 +17,47 @@ 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
 
-    if !circleci_artifact
-      print_error "[mina-circle] You must specify a `circleci_artifact`"
-      die
-    end
-    if !circleci_user
-      print_error "[mina-circle] You must specify a `circleci_user`"
-      die
+  def required_settings
+    [ 
+      :circleci_artifact,
+      :circleci_user,
+      :circleci_project,
+      :circleci_job_name,
+      :circleci_explode_command,
+      :branch,
+    ]
+  end
+
+  def ensure_and_fetch!(setting_name)
+    ensure!(setting_name)
+    fetch(setting_name)
     end
-    if !circleci_project
-      print_error "[mina-circle] You must specify a `circleci_project`"
-      die
+
+  required_settings.each do |required_setting|
+    define_method required_setting do
+      ensure_and_fetch! required_setting
     end
+  end
+
+  desc 'Downloads and explodes the archive file containing the build'
+  task :deploy do
+    required_settings.each &method(:ensure!)
+
+    options = {
+      circleci_user: circleci_user,
+      circleci_project: circleci_project,
+      branch: branch,
+      circleci_job_name: circleci_job_name,
+      circleci_artifact: circleci_artifact,
+    }
+
+    comment "[mina-circle] Fetching: #{circleci_artifact}"
+    command artifact_fetch_command(options)
+
+    command "#{circleci_explode_command} #{circleci_artifact}"
 
-    print_str "[mina-circle] Fetching: #{circleci_artifact}"
-    queue echo_cmd("curl -o #{circleci_artifact} #{artifact_url}")
-    queue echo_cmd("#{circleci_explode_command} #{circleci_artifact}")
-    queue echo_cmd("rm #{circleci_artifact}")
+    command "rm #{circleci_artifact}"
   end
 end

data/lib/mina-circle/version.rb

@@ -1,3 +1,3 @@
 module MinaCircle
-  VERSION = '1.4.0'
+  VERSION = '3.0.0.beta.1'
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: mina-circle
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 3.0.0.beta.1
 platform: ruby
 authors:
 - Patrick Simpson
 - Michael Yockey
-autorequire: 
+- Ryan Cromwell
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2021-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina
@@ -17,47 +18,32 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.0
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.0
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.8.0
@@ -65,25 +51,23 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.8.0
 description: Deploy without dependancies using mina and CircleCI.
 email:
-- patrick@heysparkbox.com
-- mike@heysparkbox.com
+- ryan@heysparkbox.com
 executables: []
 extensions: []
 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
@@ -91,7 +75,7 @@ homepage: https://github.com/sparkbox/mina-circle
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,13 +86,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Deploy your application from artifacts produced by CircleCI
 test_files: []