wooga_wooget 2.1.2 → 2.4.0

data/.travis.yml

@@ -1,20 +1,10 @@
 sudo: false
 language: ruby
 
-script: bundle exec ruby tests/package_test.rb
-
 rvm:
 - 2.3.0
 - 2.2
 - 2.1
 - 2.0
-- ruby-head
-- rbx-2
-- jruby-head
-- jruby-9000
-
-cache:
-- bundler
 
-# matrix:
-#   fast_finish: true
+before_install: gem install bundler -v 1.14.3

data/README.md

@@ -1,5 +1,7 @@
 # wooget 
 
+[![Build Status](https://travis-ci.org/wooga/wooget.svg?branch=master)](https://travis-ci.org/wooga/wooget) [![Code Climate](https://lima.codeclimate.com/github/wooga/wooget/badges/gpa.svg)](https://lima.codeclimate.com/github/wooga/wooget) [![Test Coverage](https://lima.codeclimate.com/github/wooga/wooget/badges/coverage.svg)](https://lima.codeclimate.com/github/wooga/wooget/coverage) [![Issue Count](https://lima.codeclimate.com/github/wooga/wooget/badges/issue_count.svg)](https://lima.codeclimate.com/github/wooga/wooget)
+
 A cli which allows [Unity3d](http://www.unity3d.com) projects to work with NuGet packages.
 
 ## Features

data/Rakefile

@@ -10,6 +10,14 @@ info = "#{gemspec.name} | #{gemspec.version} | " \
 "#{gemspec.runtime_dependencies.size} dependencies | " \
   "#{gemspec.files.size} files"
 
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec do
+  `bundle exec codeclimate-test-reporter`
+end
+
 
 # # #
 # Gem build and install task

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require_relative "../lib/wooget"
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/bin/wooget

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'wooget'
+require "bundler/setup"
+require_relative '../lib/wooget'
 
 begin
     Wooget::CLI.start ARGV
@@ -8,5 +9,7 @@ rescue Wooget::WoogetError => e
     $stderr.puts e.message
     exit e.exit_code
 rescue => e
-    abort e.message
+    $stderr.puts e.message
+    $stderr.puts e.backtrace * "\n"
+    exit e.exit_code
 end

data/exe/wooget

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+
+require 'wooget'
+
+begin
+    Wooget::CLI.start ARGV
+rescue Wooget::WoogetError => e
+    $stderr.puts e.message
+    exit e.exit_code
+rescue => e
+    abort e.message
+end

data/lib/wooget.rb

@@ -1,5 +1,6 @@
 require_relative "wooget/version"
 require_relative "wooget/cli"
+require_relative "wooget/github"
 require_relative "wooget/releasing"
 require_relative "wooget/build/build_info"
 require_relative "wooget/build/builder"
@@ -11,7 +12,7 @@ require_relative "wooget/util/package_list_formatter"
 require_relative "wooget/template/visual_studio"
 require_relative "wooget/template/unity"
 require_relative "wooget/util/build_error"
-
+require_relative "wooget/default"
 
 
 # Gem.find_files("wooget/**/*.rb").each { |path| require path }
@@ -26,8 +27,8 @@ module Wooget
     msg.start_with?("[quiet]") ? "#{msg.sub("[quiet]","")}" :  "[#{severity} #{datetime}] : #{msg}"
   end
 
-  @@credentials = {username: "", password: "", github_token: ""}
-  @@repos = {:default => "legacy"}
+  @@credentials = Default.credentials
+  @@repos = Default.repos
 
   def self.log
     @@log

data/lib/wooget/build/build_info.rb

@@ -26,6 +26,14 @@ module Wooget
         @invalid_reason.join ", "
       end
 
+      def version_name
+        @version.split("-").first
+      end
+
+      def prerelease?
+        !(@version !~ /prerelease/)
+      end
+
       def valid?
         valid = true
 

data/lib/wooget/build/builder.rb

@@ -1,4 +1,6 @@
 require 'octokit'
+require 'time'
+
 module Wooget
   module Build
     class Builder < Thor
@@ -52,38 +54,29 @@ module Wooget
 
       def commit_and_push build_info
         Util.run_cmd "git commit -am '#{build_info.build_name}'"
-        Util.run_cmd "git tag '#{build_info.build_name}'"
-        Util.run_cmd "git push origin --tags"
+        # Util.run_cmd "git tag '#{build_info.version}'"
+        # Util.run_cmd "git push origin --tags"
         Util.run_cmd "git push origin"
       end
 
       def github_release build_info, built_packages
-        if Wooget.credentials[:github_token].nil? or Wooget.credentials[:github_token].empty?
-          Wooget.log.error "Github Release Error - Couldn't find a value for github_token in the provided config"
+        if ENV['OCTOKIT_ACCESS_TOKEN'].nil? and (Wooget.credentials[:github_token].nil? or Wooget.credentials[:github_token].empty?)
+          Wooget.log.error "Github Release Error - Couldn't find a value for github_token in the provided config or environment"
           return
         end
 
-        #getting the github repo name from the url
-        #there must be a better way, but who cares
-        git_url = `git remote get-url origin`.chomp.chomp ".git"
-        url = git_url.split(":").last
-        repo_name = url.split('/').last(2).join("/")
+        access_token = Wooget.credentials[:github_token]
+        if access_token.empty?
+          access_token = nil
+        end
 
-        Wooget.log.info "Connecting to github with access token.."
-        client = Octokit::Client.new access_token: Wooget.credentials[:github_token]
+        github = Wooget::Github.new(options[:path], access_token)
 
-        release_options = {
-            draft: true,
-            name: build_info.build_name,
-            body: build_info.release_notes
+        github.do_release build_info.version, built_packages, **{
+          name: build_info.version_name,
+          body: build_info.release_notes,
+          prerelease: build_info.prerelease?
         }
-
-        Wooget.log.info "Creating release '#{release_options[:name]}' on repo #{repo_name}"
-        release = client.create_release repo_name, build_info.build_name, release_options
-        Wooget.log.info "Uploading assets..."
-        built_packages.each { |package| client.upload_asset release.url, package, {content_type: "application/zip" }}
-        Wooget.log.info "Publishing release.."
-        client.update_release release.url, {draft: false}
       end
 
       def build_native_extensions

data/lib/wooget/cli.rb

@@ -32,6 +32,9 @@ module Wooget
     option :version, desc:"Version number to prepend to release notes", type: :string, required: true
     option :output, desc: "Dir to place built packages", type: :string, default: "bin"
     option :release_notes, desc: "Release notes to include in the package", type: :string, default: ""
+    option :git, desc: "Use git functionality", type: :boolean, default: true
+    option :git_push, desc: "Auto push to git", type: :boolean, default: true
+    option :git_release, desc: "Create github release", type: :boolean, default: true
     option :native, desc: "Invoke native build functionality", type: :boolean, default: true
     def build
       package_release_checks
@@ -53,7 +56,10 @@ module Wooget
           release_notes: options[:release_notes],
           templates: templates,
           path: options[:path],
-          native: options[:native]
+          native: options[:native],
+          git: options[:git],
+          git_push: options[:git_push],
+          git_release: options[:git_release],
       }
 
       built_packages = invoke "wooget:packager:build", [], build_options
@@ -61,11 +67,32 @@ module Wooget
       p "#{built_packages.join " & "} built to #{File.expand_path File.join(options[:path],options[:output])}" if built_packages
     end
 
+    desc "build-name", "Prints the build name for the current dir"
+    def build_name
+      build_name = invoke "wooget:packager:build_name", [], options
+      p build_name
+    end
+
+    desc "version", "Prints the wooget's version information"
+    def version
+      puts "wooget version #{Wooget::VERSION}"
+    end
+    map %w(-v --version) => :version
+
+    option :include_version_identifier, desc: "Return version with version identifier", type: :boolean, default: false
+    desc "latest-version", "return latest version of package"
+    def latest_version
+      version = invoke "wooget:packager:latest_version", [], options
+      p version
+    end
+
     option :repo, desc: "Which repo to use"
     option :push, desc: "Should built package be pushed to repo", default: true, type: :boolean
     option :confirm, desc: "Ask for confirmation before pushing", default: true, type: :boolean
     option :output, desc: "Dir to place built packages", type: :string, default: "bin"
     option :git, desc: "Use git functionality", type: :boolean, default: true
+    option :git_push, desc: "Auto push to git", type: :boolean, default: true
+    option :git_release, desc: "Create github release", type: :boolean, default: true
     option :native, desc: "Invoke native build functionality", type: :boolean, default: true
     desc "release", "release package in current dir"
 
@@ -82,6 +109,8 @@ module Wooget
     option :confirm, desc: "Ask for confirmation before pushing", default: true, type: :boolean
     option :output, desc: "Dir to place built packages", type: :string, default: "bin"
     option :git, desc: "Use git functionality", type: :boolean, default: true
+    option :git_push, desc: "Auto push to git", type: :boolean, default: true
+    option :git_release, desc: "Create github release", type: :boolean, default: true
     option :native, desc: "Invoke native build functionality", type: :boolean, default: true
     desc "prerelease", "prerelease package in current dir"
 
@@ -257,6 +286,8 @@ module Wooget
           Wooget.repos[:default] = overridden_repo
         end
 
+        #override settings with values from environment
+
         Wooget.log.debug "Acting as #{Wooget.credentials[:username]}"
         Wooget.log.debug "Default repo is #{Wooget.repo}"
       end

data/lib/wooget/default.rb

@@ -0,0 +1,36 @@
+module Wooget
+  module Default
+
+    DEFAULT_REPO = "legacy".freeze
+
+    class << self
+      def github_token
+        ENV['GITHUB_TOKEN'] || ENV['OCTOKIT_ACCESS_TOKEN']
+      end
+
+      def user_name
+        ENV['WOOGET_USERNAME'] || ENV['WOOGET_USR']
+      end
+
+      def user_password
+        ENV['WOOGET_PASSWORD'] || ENV['WOOGET_PSW']
+      end
+
+      def default_repo
+        ENV['WOOGET_DEFAULT_REPO'] || DEFAULT_REPO
+      end
+
+      def credentials
+        { 
+          "username" => user_name,
+          "password" => user_password,
+          "github_token" => github_token 
+        }
+      end
+
+      def repos
+        { default: default_repo }
+      end
+    end
+  end
+end

data/lib/wooget/github.rb

@@ -0,0 +1,109 @@
+require 'octokit'
+
+module Wooget
+  
+  class Github
+    
+    attr_reader :working_dir, :git_command
+    attr_accessor :access_token, :logger
+    
+    def initialize(working_dir=Dir.pwd, access_token=nil, logger=nil)
+      @working_dir = working_dir
+      @git_command = "git -C #{working_dir}"
+      @github_client = nil
+      @access_token = access_token
+      @logger = (logger.nil?) ? Wooget.log : logger
+    end
+
+    def github_client
+      if @github_client.nil?
+        token = @access_token
+        if ENV['OCTOKIT_ACCESS_TOKEN'] and token.nil?
+          token = ENV['OCTOKIT_ACCESS_TOKEN']
+        end
+
+        unless token.nil?
+          @github_client = Octokit::Client.new access_token: token
+        end
+      end
+
+      @github_client
+    end
+
+    def repo
+      if @repo.nil?
+        @repo = Octokit::Repository.new repo_name
+      end
+      @repo
+    end
+
+    def repo_name
+      remote_url = `#{git_command} config --get remote.origin.url`.strip.chomp '.git'
+      remote_url.split(':').last.split('/')[-2..-1].join('/')
+    end
+
+    def inside_working_tree?
+      inside_working_tree = `#{git_command} rev-parse --is-inside-work-tree`.strip
+      inside_working_tree.eql? "true"
+    end
+
+    def current_commit_sha
+      `#{git_command} rev-parse --verify HEAD`.strip
+    end
+
+    def do_release release_name, artifacts=nil, **options
+      release_status = true
+      options = {} if options.nil?
+      artifacts = [] if artifacts.nil?
+
+      default_options = {
+        target_commitish: current_commit_sha(),
+        name: release_name,
+        body: "",
+        prerelease: false
+      }
+
+      options = default_options.merge! options
+      options[:draft] = true
+
+      logger.info "Check releases"
+      releases = github_client.releases(repo).map {|release| release.name }
+      unless releases.include? release_name
+        create_release release_name, artifacts, options
+      else
+        logger.error "Release #{options[:name]} already exist"
+        release_status = false
+      end
+      release_status
+    end
+
+    def create_release tag_name, artifacts=nil, options
+      logger.info "Creating release '#{options[:name]}' on repo #{repo_name}"
+      release = github_client.create_release repo, tag_name, options
+
+      logger.info "Uploading assets..." unless artifacts.empty?
+      artifacts.each { |artifact|
+        logger.info "--> Upload asset: #{artifact}"
+        github_client.upload_asset release.url, artifact, {content_type: "application/zip" }
+      }
+
+      logger.info "Publishing release.."
+      github_client.update_release release.url, {draft: false}
+    end
+
+    def create_tag tag_name, sha=nil, message=nil
+      sha = current_commit_sha if sha.nil?
+      message = tag_name if message.nil?
+
+      commit = github_client.commit(repo, sha).commit
+      
+      #TODO check if sha is upstream available
+      user = commit.author.name
+      email = commit.author.email
+      
+      logger.info "Create tag #{tag_name} with info from last committer"
+      t = github_client.create_tag repo, tag_name, message, sha ,"commit", user, email, Time.now.iso8601
+      github_client.create_ref repo, "tags/#{t.tag}", t.sha
+    end
+  end
+end

data/lib/wooget/releasing.rb

@@ -66,6 +66,22 @@ module Wooget
       builder.perform_build build_info
     end
 
+    option :include_version_identifier, desc: "Return version with version identifier", type: :boolean, default: false
+    desc "latest-version", "return latest version of package"
+    def latest_version
+      version, version_identifier = get_version_from_release_notes
+      if(options[:include_version_identifier])
+        version = version + "-" + version_identifier unless version_identifier.empty?  
+      end
+      version
+    end
+
+    desc "build-name", "Prints the build name for the current dir"
+    def build_name
+      build_info = get_build_info_from_template_files
+      build_info.build_name
+    end
+
     private
 
     def clean

data/lib/wooget/version.rb

@@ -3,7 +3,7 @@ Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
 module Wooget
-  VERSION = "2.1.2".freeze
+  VERSION = "2.4.0".freeze
 
   POST_INSTALL= '
                                 _   _