mina-circle 1.2.2 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81468167f380d30f567dfbee43a809965f9df4ab
-  data.tar.gz: c9ffa18957e5af1a040a5a805c8f1b1b5348682f
+  metadata.gz: 1ebe0fc91eac815704540d8c562c30548babe091
+  data.tar.gz: c9ba552f69fbc3b28322df0cd5a3dcfd319063c6
 SHA512:
-  metadata.gz: d9bf57d33748fd7a71d43b5d17796ba30db72b962d4df5ab1c97263d42ff7836f9c984161e23b6ffcc8a67b0920c50a9e927e50e2264824a2dd637b948cf54b5
-  data.tar.gz: 9b2572355f87c327925636b2ab98be4385b0aab92382e3adacf65e7076a5a38cd2f1b60079e177eaebaaf6688a5ffc526fad912e0a18500deeeee2f5da62ce0f
+  metadata.gz: d9afb3342f0c9b3d937e1922bcadf66af5b8d10830cb036f2bf2c12738c1bd697f305a56303d80fcc8b6f8c11239b3e1e3dc976a61657ac4ace4e9a3b83c4cdb
+  data.tar.gz: 799e3c53775dd0ccfce79eaf54b3e8676cfbd013e13c3c2693b582ded62e94e6076ea2ebead624a0ab8a4962bba33d37ecb039496fe0f8b3a8bf8d6c8e4772e5

data/lib/mina-circle.rb

@@ -1,7 +1,7 @@
-require 'json'
-require 'open-uri'
-
 require 'mina-circle/version'
 require 'mina-circle/helpers'
 require 'mina-circle/tasks'
-require 'mina-circle/circle_ci'
+require 'mina-circle/circle-ci/circle_ci'
+require 'mina-circle/circle-ci/client'
+require 'mina-circle/circle-ci/artifact'
+require 'mina-circle/circle-ci/project'

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

@@ -0,0 +1,20 @@
+require 'uri'
+
+class CircleCI::Artifact
+  attr_reader :response_object, :build
+  def initialize(hash)
+    @response_object = hash
+  end
+
+  def filename
+    File.basename response_object['path']
+  end
+
+  def url
+    URI(response_object.fetch('url', ''))
+  end
+
+  def contains_valid_url?
+    url.kind_of?(URI::HTTP) or url.kind_of?(URI::HTTPS)
+  end
+end

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

@@ -0,0 +1,17 @@
+class CircleCI
+  def self.artifact_url(settings = {})
+    project = CircleCI::Project.new(
+      organization: settings[:circleci_user],
+      name: settings[:circleci_project],
+      branch: settings[:branch]
+    )
+
+    artifact = project.artifacts.detect { |a|
+      a.filename == settings[:circleci_artifact]
+    }
+    raise 'Missing or invalid URL from CircleCI' unless artifact.contains_valid_url?
+    base_url = artifact.url
+    base_url.query = URI.encode_www_form({ 'circle-token' => CircleCI::Client.instance.api_token })
+    base_url.to_s
+  end
+end

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

@@ -0,0 +1,39 @@
+require 'singleton'
+require 'uri'
+require 'net/http'
+require 'base64'
+require 'yaml'
+require 'json'
+
+class CircleCI::Client
+  include Singleton
+  BASE_URI = 'https://circleci.com/api/v1.1'
+  CONFIG_FILE_PATH = File.join(Dir.home, '.mina-circle.yml')
+  attr_writer :api_token
+
+  def get(path, params = {})
+    uri = URI("#{BASE_URI}/#{path}")
+    uri.query = URI.encode_www_form(params) unless params.empty?
+    request = Net::HTTP::Get.new uri
+    request['Accept'] = 'application/json'
+    request['Authorization'] = "Basic #{Base64.encode64(api_token).chomp}"
+    response = Net::HTTP.start uri.host, uri.port, use_ssl: true do |http|
+      http.request request
+    end
+    JSON.parse response.body
+  end
+
+  def api_token
+    [
+      @api_token,
+      ENV['MINA_CIRCLE_TOKEN'],
+      system_token
+    ].compact.first
+  end
+
+  private
+
+  def system_token
+    File.exist?(CONFIG_FILE_PATH) ? YAML.load_file(CONFIG_FILE_PATH)['token'] : nil
+  end
+end

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

@@ -0,0 +1,31 @@
+class CircleCI::Project
+  attr_writer :artifacts
+  attr_reader :vcs_type, :organization, :name, :branch
+  def initialize(organization:, name:, branch:, vcs_type: 'github')
+    @organization = organization
+    @name = name
+    @vcs_type = vcs_type
+  end
+
+  def artifacts
+    @artifacts ||= fetch_artifacts
+  end
+
+  def api_path
+    [
+      'project',
+      vcs_type,
+      organization,
+      name
+    ].join('/')
+  end
+
+  private
+
+  def fetch_artifacts
+    artifact_hashes = CircleCI::Client.instance.get "#{api_path}/latest/artifacts", filter: 'successful', branch: branch
+    artifact_hashes.collect { |artifact_hash|
+      CircleCI::Artifact.new artifact_hash
+    }
+  end
+end

data/lib/mina-circle/helpers.rb

@@ -1,21 +1,21 @@
+require 'uri'
 module MinaCircle
   module Helpers
-    def build_url
-      latest_build = circle_ci.builds.first
-      artifacts = circle_ci.artifacts(latest_build).select { |artifact|
-        artifact.filename == circle_artifact
+    def artifact_url
+      options = settings.select { |k,v|
+        k.to_s.start_with? artifact_source.to_s.downcase or
+          options_whitelist.include? k
       }
-      raise "No artifacts found for build: #{latest_build.build_num} on #{branch}. #{latest_build.status}" if artifacts.empty?
-      artifacts.first.url
-    rescue Exception => e
+      Module.const_get(artifact_source.to_s).artifact_url(options)
+    rescue RuntimeError => e
+      puts "Unable to determine url for deployment artifact"
       puts e.message
-      puts ""
-      puts "Review your build at to ensure artifacts are being captured as described in https://circleci.com/docs/build-artifacts/"
     end
 
-    def circle_ci
-      @circle_ci ||= CircleCI.new circle_user, circle_project, branch
+    def options_whitelist
+      [
+        :branch
+      ]
     end
   end
 end
-

data/lib/mina-circle/tasks.rb

@@ -6,26 +6,26 @@ extend MinaCircle::Helpers
 #
 # ## Settings
 #
-# ### circle_user
+# ### circleci_user
 # user name
 #
-# ### circle_project
+# ### circleci_project
 # Name by which CircleCI knows your project
 #
-# ### circle_artifact
+# ### circleci_artifact
 # Name CircleCI calls your build archive
 #
-# ### circle_explode_command
+# ### circleci_explode_command
 # Command with options for decompressing the artifact archive
 
-namespace :circleci do
+set :artifact_source, :CircleCI
 
+namespace :mina_circle do
   desc 'Downloads and explodes the archive file containing the build'
   task :deploy do
-    puts "[mina-circle] Fetching: #{circle_artifact}"
-    queue "curl -o #{circle_artifact} #{build_url}"
-    queue "#{circle_explode_command} #{circle_artifact}"
-    queue "rm #{circle_artifact}"
+    puts "[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}")
   end
 end
-

data/lib/mina-circle/version.rb

@@ -1,3 +1,3 @@
 module MinaCircle
-  VERSION = '1.2.2'
+  VERSION = '1.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina-circle
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.2
 platform: ruby
 authors:
 - Patrick Simpson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina
@@ -51,46 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.4.0
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.22'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.22.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.22'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.22.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +80,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/mina-circle.rb
-- lib/mina-circle/circle_ci.rb
+- lib/mina-circle/circle-ci/artifact.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/helpers.rb
 - lib/mina-circle/tasks.rb
 - lib/mina-circle/version.rb

data/lib/mina-circle/circle_ci.rb

@@ -1,64 +0,0 @@
-require 'open-uri'
-
-class CircleCI
-  BASE_URI = 'https://circleci.com/api/v1'
-  attr_accessor :organization, :project, :branch
-  def initialize(organization, project, branch = 'master')
-    @organization = organization
-    @project = project
-    @branch = branch
-  end
-
-  def builds
-    get("tree/#{branch}").collect { |build_hash| Build.new(build_hash) }
-  end
-
-  def artifacts(build)
-    puts "Build: #{build.build_num}"
-    get("#{build.build_num}/artifacts").collect { |artifact_hash| Artifact.new(artifact_hash) }
-  rescue
-    puts "No artifact found for build #{build.build_num} on #{@branch}"
-  end
-
-  def get(path)
-    url = build_url path
-    JSON.parse(open(url).read)
-  rescue OpenURI::HTTPError
-    []
-  end
-
-  def build_url(path)
-    url = "#{BASE_URI}/project/#{organization}/#{project}/#{path}"
-    url << "?circle-token=#{CircleCI.token}" if CircleCI.token
-    url
-  end
-
-  def self.token
-    @@token ||= get_token
-  end
-
-  def self.get_token
-    return ENV['MINA_CIRCLE_TOKEN'] if ENV['MINA_CIRCLE_TOKEN']
-    config_file = File.join(Dir.home, '.mina-circle.yml')
-    File.exist?(config_file) ? YAML.load_file(config_file)['token'] : nil
-  end
-
-  class Artifact
-    attr_reader :source_url, :filename
-    def initialize(hash)
-      @filename = File.basename hash['path']
-      @source_url = hash['url']
-    end
-
-    def url
-      CircleCI.token.nil? ? source_url : "#{source_url}?circle-token=#{CircleCI.token}"
-    end
-  end
-
-  class Build
-    attr_reader :build_num
-    def initialize(hash)
-      @build_num = hash['build_num']
-    end
-  end
-end