mina-circle 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57b8dae1fd8fdf70ef8a203e9ffb88c33ba5018b
-  data.tar.gz: 4bfce7a82b201c0d201346a3db280e07319bde1e
+  metadata.gz: 50e60356adc20c3e4b3ad9065ada8a663fcbe006
+  data.tar.gz: b2ec033ee11e236f4d400e9593f18b9c1fe715f7
 SHA512:
-  metadata.gz: d6ff774ef06f9e111581ed8f3768f3706d73fbc79aeb66b8f36f0bbe4e1d87e7f1e26c0a7431dd40dfeae2d380db5f4293ef5dd86679afe1c921ed5fdb40e7d0
-  data.tar.gz: ae361fe682087d88974d934eec5ecc759a10787992eafac16e673d8e58a0904b45efbec17724a70f5ecd68338e61ba47f09a6a50b2787e1181395265e4710859
+  metadata.gz: 4323a7ad1e8947c93e06d19506ad9a71de6690f6d29265cf2f373127c99a5beb4ce280ed3c3144d034fbee1c62131d1c698b4515c3201b3bcc5bcf68127edc8d
+  data.tar.gz: fac5ca660bb3c8fcf7a8c629321164837a507ab6e2bd162b6f48e7eea4641a57e9b59f3bd4f0179953c016455d09e5e4a46e15930267dba1c9599b5a27e8fc49

data/lib/mina-circle.rb

@@ -4,3 +4,4 @@ require 'open-uri'
 require 'mina-circle/version'
 require 'mina-circle/helpers'
 require 'mina-circle/tasks'
+require 'mina-circle/circle_ci'

data/lib/mina-circle/circle_ci.rb

@@ -0,0 +1,62 @@
+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)
+    get("#{build.build_num}/artifacts").collect { |artifact_hash| Artifact.new(artifact_hash) }
+  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
+

data/lib/mina-circle/helpers.rb

@@ -1,26 +1,14 @@
 module MinaCircle
   module Helpers
-    def parse_from_home_dir
-      File.exist?(config_file) ? YAML.load_file(config_file)['token'] : nil
-    end
-
-    def config_file
-      File.join(Dir.home, '.mina-circle.yml')
-    end
-
-    def latest_build_number
-      base_uri = 'https://circleci.com/api/v1/project'
-      base_path = "#{circle_user}/#{circle_project}/tree/#{branch}"
-      url = "#{base_uri}/#{base_path}?circle-token=#{circle_token}&limit=1&filter=completed"
-      build_num = JSON.parse(open(url).read).first['build_num'].to_s
-      puts "[mina-circle] Build number: #{build_num}"
-      puts "[mina-circle] Using username/project: #{circle_user}/#{circle_project}"
-      puts "[mina-circle] Branch: #{branch}"
-      build_num
+    def build_url
+      latest_build = circle_ci.builds.first
+      circle_ci.artifacts(latest_build).select { |artifact|
+        artifact.filename == circle_artifact
+      }.first.url
     end
 
-    def build_url
-      "https://circle-artifacts.com/gh/#{circle_user}/#{circle_project}/#{latest_build_number}/artifacts/0/home/ubuntu/#{circle_artifact}?circle-token=#{circle_token}"
+    def circle_ci
+      @circle_ci ||= CircleCI.new circle_user, circle_project, branch
     end
   end
 end

data/lib/mina-circle/tasks.rb

@@ -6,9 +6,6 @@ extend MinaCircle::Helpers
 #
 # ## Settings
 #
-# ### circle_token
-# API access token. By default this is taken from ~/.mina-circle.yml if it exists
-#
 # ### circle_user
 # user name
 #
@@ -21,8 +18,6 @@ extend MinaCircle::Helpers
 # ### circle_explode_command
 # Command with options for decompressing the artifact archive
 
-set_default(:circle_token, parse_from_home_dir || fail('CircleCI token required'))
-
 namespace :circleci do
 
   desc 'Downloads and explodes the archive file containing the build'

data/lib/mina-circle/version.rb

@@ -1,3 +1,3 @@
 module MinaCircle
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina-circle
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Patrick Simpson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina
@@ -31,6 +31,86 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !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
+  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
+- !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
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.8.0
+  type: :development
+  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
@@ -40,6 +120,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/mina-circle.rb
+- lib/mina-circle/circle_ci.rb
 - lib/mina-circle/helpers.rb
 - lib/mina-circle/tasks.rb
 - lib/mina-circle/version.rb
@@ -63,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Deploy your application from artifacts produced by CircleCI