git-semaphore 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e9733453309cb3c5b3e0b37c3caf3d4b3825cc28
-  data.tar.gz: 0497c7bdfe034c178905e1603ef753285282cccf
+SHA256:
+  metadata.gz: 04e832399e5dbfcb19a7e70ff162852ca8edde0207404024b85b9e6ba22f5993
+  data.tar.gz: 2254b33858b625230a9127793184c6e9dfecbf06afa1d2e696f4c473feae2f84
 SHA512:
-  metadata.gz: da315dcce58237a6b00f3193338256445d6d4ae6698546c26380be02cf62636ebce7497b0252d20a2f0c31e491e9f3f4c6048789d71e789370155f7b97328865
-  data.tar.gz: 5ad0d0af9c142e062db22e2bdc0469c47a38c26176458362051a79f00861017a35c4b6dc6782cf4ec2beebfce9b6a2b33657511bfea6947f626df1e466e3d2b9
+  metadata.gz: dbe85ef95117da76498f1c22b38b3b39a6eb65f6a5ab4484262758296571b4858c0719505c2043f65651f362041fdc20a093b2c55570456fcdae9f104f72b5ce
+  data.tar.gz: bafc84bdc4ab86b5b6182518a7c8b95e2e29bb4f1ddce28f84da160048002a28ce21e3bc4e8c97db6f38694634bd921e3ac00636332ab3871fd2f15c227d110e

data/.pryrc

@@ -1,10 +1,16 @@
-$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+# this loads all of "git-semaphore"
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'git/semaphore'
 
 # utility function to set pry context
 # to an instance of <Rugged::Repository>
-def repository() pry Git::Semaphore.git_repo ; end
+def repository
+  pry Git::Semaphore.git_repo
+end
 
 # utility function to set pry context
 # to an instance of <Git::Semaphore::Project>
-def project() pry Git::Semaphore::Project.from_repo(Git::Semaphore.git_repo) ; end
+def project
+  pry Git::Semaphore::Project.from_repo(Git::Semaphore.git_repo)
+end

data/.rubocop.yml

@@ -0,0 +1,36 @@
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: false
+Layout/EmptyLinesAroundClassBody:
+  Enabled: false
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: false
+Layout/EmptyLineBetweenDefs:
+  Enabled: false
+Layout/MultilineOperationIndentation:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Metrics/LineLength:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+
+Style/Alias:
+  Enabled: false
+Style/BlockDelimiters:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Style/EmptyCaseCondition:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Style/SingleLineMethods:
+  Enabled: false
+Style/TrailingCommaInLiteral:
+  Enabled: false
+Style/TrailingCommaInArguments:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.5.1

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
 # Specify your gem's dependencies in git-semaphore.gemspec
 gemspec

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2016 Peter Vandenberk
+Copyright (c) 2012-2018 Peter Vandenberk
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -1,19 +1,33 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+# rubocop:disable Style/SymbolArray
+# rubocop:disable Style/HashSyntax
 
-task :default => :test
+require 'bundler/gem_tasks'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
+task :validate_gemspec do
+  Bundler.load_gemspec('git-semaphore.gemspec').validate
 end
 
-task :gemspec do
-  @gemspec ||= eval(File.read(Dir["*.gemspec"].first))
+task :version => :validate_gemspec do
+  puts Git::Semaphore::VERSION
 end
 
-desc "Validate the gemspec"
-task :validate => :gemspec do
-  @gemspec.validate
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new(:rubocop)
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
 end
+
+task :default => [:rubocop, :test]
+
+task :documentation
+
+Rake::Task['build'].enhance([:default, :documentation])
+
+# rubocop:enable Style/HashSyntax
+# rubocop:enable Style/SymbolArray

data/bin/console

@@ -1,14 +1,9 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "git/semaphore"
+require 'bundler/setup'
+require 'git/semaphore'
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-require "pry"
+require 'pry'
 Pry.start
 
-# require "irb"
-# IRB.start
+# That's all Folks!

data/bin/setup

@@ -4,7 +4,10 @@ IFS=$'\n\t'
 set -vx
 
 rbenv install -s
-gem install bundler
+gem install --conservative bundler
 bundle install
 
+set +vxeu
+echo
+
 # That's all Folks!

data/exe/git-semaphore

@@ -1,97 +1,96 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'git/semaphore'
 
 require 'slop'
 
-options = Slop.parse(help: true) do
+options = Slop.parse(help: true) do |o|
 
-  on :version, 'Print the version' do
-    puts Git::Semaphore::COPYRIGHT
+  o.banner = <<~"BANNER"
+    Usage: git-semaphore [options]
+
+      v#{Git::Semaphore::VERSION}
+
+    Options:
+  BANNER
+
+  o.on '--version', 'Print the version' do
+    puts Git::Semaphore::LONG_VERSION
     exit(0)
   end
 
-  banner Git::Semaphore::BANNER
-
-  on :settings, 'Display most relevant settings'
-  on :internals, 'Display all internal settings'
+  o.on '--help', 'Print help message' do
+    puts o
+    exit(0)
+  end
 
-  on :browse, 'Open the project on https://semaphoreci.com/'
+  o.on '--refresh',     'Bypass cached information and refresh from API'
 
-  on :clean, 'Deletes the cached API query results'
+  o.on '--projects',    'List all projects and their current status'
 
-  on :projects, 'List all projects and their current status'
-  on :branches, 'List all branches for the current project'
-  on :status, 'List the build status for the current branch'
-  on :history, 'List the build history for the current branch'
-  on :information, 'List the commit information for the last build'
-  on :log, 'List the build log for the last build'
-  on :rebuild, 'Rebuild last revision for the current branch'
+  o.on '--browse',      'Open the project on https://semaphoreci.com/'
+  o.on '--rebuild',     'Rebuild last revision for the current branch'
 
-end
+  o.on '--settings',    'Display most relevant settings'
+  o.on '--internals',   'Display all internal settings'
 
-if options.clean?
-  Git::Semaphore.empty_cache_dir
-  exit 0
-end
+  o.on '--branches',    'List all branches for the current project'
+  o.on '--status',      'List the build status for the current branch'
+  o.on '--history',     'List the build history for the current branch'
+  o.on '--information', 'List the commit information for the last build'
+  o.on '--log',         'List the build log for the last build'
 
-if options.projects?
-  puts Git::Semaphore::Project.all.to_json
-  exit 0
 end
 
 project = if (git_repo = Git::Semaphore.git_repo)
-  Git::Semaphore::Project.from_repo(git_repo)
-else
-  Git::Semaphore::Project.from_config(ENV)
-end
+            Git::Semaphore::Project.from_repo(git_repo)
+          else
+            Git::Semaphore::Project.from_config(ENV)
+          end
 
-if options.settings?
-  puts project.settings.to_json
-  exit 0
-end
+class SafeProject
+  # rubocop:disable Style/MethodMissing
 
-if options.internals?
-  puts project.internals.to_json
-  exit 0
-end
+  def initialize(project)
+    @project = project
+  end
 
-if options.browse?
-  `open #{project.branch_url}`
-  exit 0
-end
+  def method_missing(name, *args, &block)
+    if @project.exist?
+      @project.send(name, *args, &block)
+    else
+      { error: "Project #{@project.full_name} doesn't exist on semaphoreci.com" }
+    end
+  end
 
-if options.branches?
-  puts project.branches.to_json
-  exit 0
-end
+  def respond_to?(name, include_all = false)
+    @project.respond_to? name, include_all
+  end
 
-if options.status?
-  puts project.status.to_json
-  exit 0
+  # rubocop:enable Style/MethodMissing
 end
 
-if options.history?
-  puts project.history.to_json
-  exit 0
-end
+project = SafeProject.new(project)
+refresh = options.refresh?
 
-if options.information?
-  puts project.information.to_json
-  exit 0
-end
+case
+when options.projects?    then puts Git::Semaphore::Project.all(refresh).to_json
 
-if options.log?
-  puts project.log.to_json
-  exit 0
-end
+when options.browse?      then puts project.browse.to_json
+when options.rebuild?     then puts project.rebuild.to_json
 
-if options.rebuild?
-  puts project.rebuild
-  exit 0
-end
+when options.settings?    then puts project.settings.to_json
+when options.internals?   then puts project.internals.to_json
 
-fail "Coming soon!"
+when options.branches?    then puts project.branches(refresh).to_json
+when options.status?      then puts project.status(refresh).to_json
+when options.history?     then puts project.history(refresh).to_json
+when options.information? then puts project.information(refresh).to_json
+when options.log?         then puts project.log(refresh).to_json
+else
+  puts options
+end
 
 # That's all Folks!

data/git-semaphore.gemspec

@@ -1,31 +1,34 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'git/semaphore/version'
+require 'git/semaphore/gemspec'
 
 Gem::Specification.new do |spec|
-  spec.name          = "git-semaphore"
+  spec.name          = Git::Semaphore::NAME
   spec.version       = Git::Semaphore::VERSION
-  spec.authors       = ["Peter Vandenberk"]
-  spec.email         = ["pvandenberk@mac.com"]
+  spec.authors       = ['Peter Vandenberk']
+  spec.email         = ['pvandenberk@mac.com']
 
-  spec.summary       = %q{git integration with semaphoreci.com}
-  spec.description   = %q{command-line integration with semaphoreci.com for git repositories}
-  spec.homepage      = "https://github.com/pvdb/git-semaphore"
-  spec.license       = "MIT"
+  spec.summary       = 'git integration with semaphoreci.com'
+  spec.description   = 'command-line integration with semaphoreci.com for git repositories'
+  spec.homepage      = 'https://github.com/pvdb/git-semaphore'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.files         = begin
+                         `git ls-files -z`
+                           .split("\x0")
+                           .reject { |f| f.match(%r{^(test|spec|features)/}) }
+                       end
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "slop", "~> 3.0"
-  spec.add_dependency "rugged" , "~> 0.24"
+  spec.post_install_message = Git::Semaphore::PIM
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_dependency 'rugged', '~> 0.27'
+  spec.add_dependency 'slop', '~> 4.6'
 
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-rescue"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake'
 end

data/lib/git/semaphore.rb

@@ -1,16 +1,19 @@
 require 'uri'
 require 'date'
 require 'json'
+require 'time'
 require 'openssl'
 require 'net/http'
 require 'fileutils'
 
 require 'rugged'
 
-class Rugged::Repository
-  def owner()     File.basename(File.dirname(workdir)) ; end
-  def name()      File.basename(workdir) ;               end
-  def full_name() "#{owner}/#{name}" ;                   end
+module Rugged
+  class Repository
+    def owner()     File.basename(File.dirname(workdir)); end
+    def name()      File.basename(workdir);               end
+    def full_name() "#{owner}/#{name}";                   end
+  end
 end
 
 module Git
@@ -24,24 +27,24 @@ module Git
 
     def self.cache_dir
       @cache_dir ||= begin
-        File.join(self.home_dir, '.git', 'semaphore').tap do |cache_dir|
+        File.join(home_dir, '.git', 'semaphore').tap do |cache_dir|
           FileUtils.mkdir_p(cache_dir)
         end
       end
     end
 
-    def self.cache_dir_for identifier
-      File.join(self.cache_dir, identifier).tap do |cache_dir|
+    def self.cache_dir_for(identifier)
+      File.join(cache_dir, identifier).tap do |cache_dir|
         FileUtils.mkdir_p(cache_dir)
       end
     end
 
     def self.empty_cache_dir
-      FileUtils.rm_r Dir.glob(File.join(self.cache_dir, '*'))
+      FileUtils.rm_r Dir.glob(File.join(cache_dir, '*'))
     end
 
-    def self.from_json_cache path
-      if File.exists? path
+    def self.from_json_cache(path, refresh = false)
+      if !refresh && File.exist?(path)
         JSON.parse(File.read(path))
       else
         yield.tap do |content|
@@ -51,31 +54,31 @@ module Git
     end
 
     def self.git_repo
-      begin
-        Rugged::Repository.new(Dir.pwd)
-      rescue Rugged::RepositoryError
-        nil
-      end
+      Rugged::Repository.new(Dir.pwd)
+    rescue Rugged::RepositoryError
+      nil
     end
 
     def self.env_auth_token
       @env_auth_token ||= ENV['SEMAPHORE_AUTH_TOKEN']
     end
 
+    def self.global_auth_token
+      Rugged::Config.global['semaphore.authtoken']
+    end
+
     def self.git_auth_token
-      git_repo && git_repo.config['semaphore.authtoken']
+      git_repo&.config&.get('semaphore.authtoken')
     end
 
     def self.auth_token
-      git_auth_token || env_auth_token
+      git_auth_token || global_auth_token || env_auth_token
     end
 
   end
 end
 
 require 'git/semaphore/version'
-require 'git/semaphore/banner'
-require 'git/semaphore/copyright'
 
 require 'git/semaphore/api'
 require 'git/semaphore/api_cache'