targit 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc7c75ab2e849e39e06887d5df8044695f033ced
-  data.tar.gz: f0c5e9dafa2fbf31125b6efb6c36cb38e7c54512
+  metadata.gz: 9a6f6704460360a2e8248be6fe24353af06eb91f
+  data.tar.gz: 882f78545351adad22d2ede7fc3aa4b0e3ce4640
 SHA512:
-  metadata.gz: 261daa72303a3406eecb7fafd53f379d70a8d37ca37cf20e02e310ea21aa8ed68fc3ee36de0748ba1ff7e52a4a415eaa57317cedbfbe0532f01847f2034f4a15
-  data.tar.gz: 927117fbf0e831f9c8720465b8040dd50474c0c45777a3c7b21e2119901b3fddaf3c8feec241a6e7fa471962a680fe4e9bbdf83141d621a131f2bc0508cf93f6
+  metadata.gz: 350dba608c95da32eb1ef03147d01a66a5b7d9b4cee3dba57aa2a5180ab9adeefb6427508df5b50f1c86e84c651b05f6c03b409ebe27c0c9632d341d78b2cda4
+  data.tar.gz: 1dc6688a82844894d895682d645a4c99345c493fe5bffbe0d4ccf2a108b5cbec3a7b7545eb47d8bfee1918ce8cc3d336e01ef7c63d493eb91a16c0c738de730c

data/Rakefile

@@ -7,7 +7,7 @@ RSpec::Core::RakeTask.new(:spec)
 
 desc 'Run Rubocop on the gem'
 RuboCop::RakeTask.new(:rubocop) do |task|
-  task.patterns = ['lib/**/*.rb', 'spec/**/*.rb']
+  task.patterns = ['lib/**/*.rb', 'spec/**/*.rb', 'bin/*']
   task.fail_on_error = true
 end
 

data/bin/targit

@@ -1,7 +1,29 @@
 #!/usr/bin/env ruby
 
 require 'targit'
+require 'mercenary'
 
-x = Targit.new('/Users/akerl/Code/Dock0/arch/root.tar.xz', repo: 'dock0/arch', tag: 'v0.0.fish', create: true, force: true)
-x.upload!
+Mercenary.program(:targit) do |p|
+  p.version Targit::VERSION
+  p.description 'Tool for adding GitHub release assets'
+  p.syntax 'targit [options] USER/REPO TAG /path/to/file'
 
+  # rubocop:disable Style/LineLength
+  p.option :force, '-f', '--force', 'Replace the asset if it already exists'
+  p.option :create, '-c', '--create', 'Create release if it does not exist'
+  p.option :prerelease, '-p', '--prerelease', 'With -c, create as a dev release'
+  p.option :authfile, '-a FILE', '--authfile FILE', 'Set the auth file for GitHub credentials'
+  # rubocop:enable Style/LineLength
+
+  p.action do |args, options|
+    repo, tag, file = args
+    if repo && tag && file
+      puts "Attempting to upload #{file} on #{tag} of #{repo}"
+      asset = Targit.new(file, repo, tag, options)
+      asset.upload!
+      puts "Successfully created asset! #{asset.url}"
+    else
+      puts p
+    end
+  end
+end

data/lib/targit.rb

@@ -11,5 +11,6 @@ module Targit
   end
 end
 
+require 'targit/version'
 require 'targit/asset'
 require 'targit/release'

data/lib/targit/asset.rb

@@ -7,12 +7,12 @@ module Targit
   class Asset
     attr_reader :release, :asset, :name, :github_data
 
-    def initialize(asset, params = {})
+    def initialize(asset, repo, tag, params = {})
       @options = params
       @config = _config
       @client = _client
-      @release = _release
-      @upload_options = _options
+      @release = _release repo, tag
+      @upload_options = _upload_options
       @asset = asset
       @name = @upload_options[:name] || File.basename(@asset)
     end
@@ -20,7 +20,8 @@ module Targit
     def upload!
       delete! if @options[:force]
       fail('Release asset already exists') if already_exists?
-      @client.upload_asset @release[:url], @asset, @options
+      asset = @client.upload_asset @release.data[:url], @asset, @upload_options
+      @client.release_asset asset[:url]
     end
 
     def already_exists?
@@ -34,7 +35,12 @@ module Targit
     end
 
     def github_data
-      @client.release_assets(@release[:url]).find { |x| x[:name] == @name }
+      @client.release_assets(@release.data[:url]).find { |x| x[:name] == @name }
+    end
+
+    def url
+      'https://github.com/' \
+        "#{@release.repo}/releases/download/#{@release.tag}/#{@name}"
     end
 
     private
@@ -58,11 +64,11 @@ module Targit
       )
     end
 
-    def _release
-      Targit::Release.new(@client, @options).data
+    def _release(repo, tag)
+      Targit::Release.new(@client, repo, tag, @options)
     end
 
-    def _options
+    def _upload_options
       [:name, :content_type].each_with_object({}) do |option, hash|
         hash[option] = @options[option] if @options[option]
       end

data/lib/targit/release.rb

@@ -2,26 +2,36 @@ module Targit
   ##
   # GitHub Release object
   class Release
-    attr_reader :data
+    attr_reader :data, :repo, :tag
 
-    def initialize(client, params = {})
+    def initialize(client, repo, tag, params = {})
       @client = client
-      @data = find params
-      create(params) if @data.nil? && params[:create]
+      @options = params
+      @repo = repo
+      @tag = tag
+      @create_options = _create_options
+      @data = find
+      create if @data.nil? && @options[:create]
+      fail('No release found') if @data.nil?
     end
 
     private
 
-    def find(params)
-      @client.releases(params[:repo]).find do |x|
-        x[:tag_name] == params[:tag]
+    def find
+      @client.releases(@repo).find do |x|
+        x[:tag_name] == @tag
       end
     end
 
-    def create(params)
-      @client.create_release(params[:repo], params[:tag])
-      params[:create] = false
-      find params
+    def create
+      @client.create_release(@repo, @tag)
+      @data = find
+    end
+
+    def _create_options
+      [:prerelease, :target_commitish].each_with_object({}) do |option, hash|
+        hash[option] = @options[option] if @options[option]
+      end
     end
   end
 end

data/lib/targit/version.rb

@@ -0,0 +1,5 @@
+##
+# Set the version (needed for Mercenary -v)
+module Targit
+  VERSION = '0.0.2'
+end

data/targit.gemspec

@@ -1,6 +1,9 @@
+$:.unshift File.expand_path('../lib/', __FILE__)
+require 'targit/version'
+
 Gem::Specification.new do |s|
   s.name        = 'targit'
-  s.version     = '0.0.1'
+  s.version     = Targit::VERSION
   s.date        = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = 'Tool for adding GitHub release assets'
@@ -16,6 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'octokit', '~> 3.2.0'
   s.add_dependency 'octoauth', '~> 0.0.6'
+  s.add_dependency 'mercenary', '~> 0.3.3'
 
   s.add_development_dependency 'rubocop', '~> 0.24.0'
   s.add_development_dependency 'rake', '~> 10.3.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: targit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Les Aker
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: mercenary
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +141,7 @@ files:
 - lib/targit.rb
 - lib/targit/asset.rb
 - lib/targit/release.rb
+- lib/targit/version.rb
 - spec/spec_helper.rb
 - spec/targit_spec.rb
 - targit.gemspec