git-whistles 1.4 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb217a24a9bf72d8848bd71a7aebe6cd72aab242
-  data.tar.gz: 3394755ee665050df2d1ad5bff5aa4085e2c3c34
+SHA256:
+  metadata.gz: 5370bb6eb6cf2a8416a778eec5456cc2d20001c456a91019acaff9984f0935df
+  data.tar.gz: f3859092a418473ec972aace568d0bc99713030ae9916973c14af5613853ce86
 SHA512:
-  metadata.gz: 7e1c34b16126bca49a5d6d7b3d75e7de6faec1d3f4ed1b439f7e5c5a1d7f0860220adb0249c50cae78ea82187bf59f2779e0d7e16f76c98aa4c590521b6faf88
-  data.tar.gz: 0b7d9494570c47f0504f1ed519a51059b6af298967337563926c07d1a14f1bc7a9511f434e11bc16d21fe7f5778b70affdf4c73a3f7199c350022117320b1a64
+  metadata.gz: 3055d1cba34b978b19d043083ff207e06d1720b2aa825a9f88bd592f4298ba44865c1821fabc1aa56590524e250c364217514daba2276f5f9f836348fe97d8e5
+  data.tar.gz: a425f75e25a8a5b73e9a519dbf5494bf752f46315457cbeee39403a02dd79a47cef41b5ad56048b30a777727720bfff5a64e07eba0a92440bc7e30333f9e67eb

data/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_CACHE_ALL: "true"

data/.github/workflows/ruby.yml

@@ -0,0 +1,47 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version:
+          - "3.1"
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@0a29871fe2b0200a17a4497bae54fe5df0d973aa # v1.115.3
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+    - name: Install package
+      run: |
+        sudo apt-get -y install gettext
+        which msguniq
+
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -1,10 +1,8 @@
-*.gem
 *.rbc
-.bundle
 .config
 .yardoc
-pkg
+/pkg
 rdoc
 tmp
 nbproject
-.idea/
+.idea/

data/.ruby-version

@@ -0,0 +1 @@
+3.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-whistles (1.4)
+    git-whistles (1.4.2)
       jira-ruby (~> 1.0.0)
       pivotal-tracker (~> 0.5.6)
       term-ansicolor
@@ -10,92 +10,104 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.10)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    builder (3.2.3)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    domain_name (0.5.20170404)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
+    crack (0.4.5)
+      rexml
+    diff-lcs (1.5.0)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    hashdiff (0.3.7)
-    http-cookie (1.0.3)
+    hashdiff (1.0.1)
+    hashie (5.0.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
-    httparty (0.15.6)
+    httparty (0.20.0)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (0.9.0)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     jira-ruby (1.0.0)
       activesupport (~> 4.2, >= 4.2.0)
       oauth (~> 0.5, >= 0.5.0)
-    method_source (0.8.2)
-    mime-types (3.1)
+    method_source (1.0.0)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.3.0)
-    minitest (5.10.3)
+    mime-types-data (3.2022.0105)
+    mini_portile2 (2.8.0)
+    minitest (5.16.3)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
+    multipart-post (2.2.3)
     netrc (0.11.0)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
-    nokogiri-happymapper (0.6.0)
+    nokogiri (1.13.8)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    nokogiri-happymapper (0.9.0)
       nokogiri (~> 1.5)
-    oauth (0.5.3)
+    oauth (0.6.2)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
     pivotal-tracker (0.5.13)
       builder
       crack
       nokogiri (>= 1.5.5)
       nokogiri-happymapper (>= 0.5.4)
       rest-client (>= 1.8.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-nav (0.2.4)
-      pry (>= 0.9.10, < 0.11.0)
-    public_suffix (3.0.0)
-    rake (12.1.0)
-    rest-client (2.0.2)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-nav (1.0.0)
+      pry (>= 0.9.10, < 0.15)
+    public_suffix (5.0.0)
+    racc (1.6.0)
+    rake (13.0.6)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    safe_yaml (1.0.4)
-    slop (3.6.0)
-    term-ansicolor (1.6.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.1)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
     thread_safe (0.3.6)
-    tins (1.15.0)
-    tzinfo (1.2.3)
+    tins (1.31.1)
+      sync
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
-    vcr (3.0.3)
-    webmock (3.1.0)
-      addressable (>= 2.3.6)
+    unf_ext (0.0.8.2)
+    vcr (6.1.0)
+    version_gem (1.1.1)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
     youtrack (0.0.11)
       httparty
       multipart-post
@@ -114,4 +126,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.15.1
+   2.3.22

data/README.md

@@ -81,12 +81,12 @@ Add this to your user global ~/.gitconfig:
 
 ### JIRA
 
-All JIRA commands require a JIRA username, password and site. Please use the following commands
+All JIRA commands require a JIRA username, [API token](https://id.atlassian.com/manage/api-tokens) and site. Please use the following commands
 to set it up:
 
 ```
 $ git config [--global] jira.username <username>
-$ git config [--global] jira.password <password>
+$ git config [--global] jira.token <token>
 $ git config [--global] jira.site <https://mydomain.atlassian.net>
 ```
 

data/bin/git-jira-branch

@@ -64,21 +64,23 @@ class App < Git::Whistles::App
     # create branch
     `cd #{ENV['PWD']} && git checkout -b #{branch_name}`
 
-    # issue.notes.create :text => "Created branch #{branch_name}"
-    # issue.update :current_state => 'started'
-    attrs = {
-      update: {
-        comment: [ { add: { body: "Created branch #{branch_name}" } } ],
-        assignee: [ { set: { name: username } } ]
-      }
-    }
-    issue.save!(attrs)
+    # assign
+    issue.client.put("#{issue.url}/assignee", { accountId: account_id }.to_json)
 
-    if transition
-      attrs = { transition: { id: transition } }
-      issue.client.post("#{issue.url}/transitions", attrs.to_json)
+    # transition
+    if transition.present?
+      issue.client.post("#{issue.url}/transitions", { transition: { id: transition } }.to_json)
     end
 
+    # add comment
+    issue.save!(
+      update: {
+        comment: [
+          { add: { body: "Created branch #{branch_name}" } }
+        ]
+      }
+    )
+
     puts Term::ANSIColor.green('Created branch and started JIRA issue')
   end
 
@@ -107,6 +109,10 @@ class App < Git::Whistles::App
     @username ||= `git config jira.username`.strip
   end
 
+  def account_id
+    @account_id ||= `git config jira.accountId`.strip
+  end
+
   def get_jira_info(issue_id)
     log.info "Finding your JIRA Issue¬"
 

data/lib/git-whistles/jira.rb

@@ -1,7 +1,7 @@
 module Git
   module Whistles
     class Jira
-      attr_reader :username, :password, :site
+      attr_reader :username, :token, :site
 
       def initialize
         get_config
@@ -10,7 +10,7 @@ module Git
       def get_client(opts = {})
         options = {
           username: @username,
-          password: @password,
+          password: @token,
           site: @site,
           context_path: '',
           auth_type: :basic,
@@ -34,13 +34,13 @@ module Git
           raise "Aborting."
         end
 
-        @password = `git config jira.password`.strip
-        if password.empty?
+        @token = `git config jira.token`.strip
+        if token.empty?
           puts Term::ANSIColor.yellow %Q{
             Your branch appears to have a issue ID,
-            but I don't know your JIRA password!
+            but I don't know your JIRA token!
             Please set it with:
-            $ git config [--global] jira.password <password>
+            $ git config [--global] jira.token <token>
           }
           raise "Aborting."
         end

data/lib/git-whistles/version.rb

@@ -4,7 +4,7 @@ require 'pathname'
 
 module Git
   module Whistles
-    VERSION = '1.4'
+    VERSION = '1.4.2'
     GEMDIR = Pathname.new(__FILE__).parent.parent.parent
   end
 end

data/lib/git-whistles/youtrack/api.rb

@@ -1,6 +1,7 @@
 require 'youtrack'
-require_relative 'ticket'
 require 'term/ansicolor'
+require_relative '../../git-whistles'
+require_relative 'ticket'
 
 module Git::Whistles
   module Youtrack

data/lib/git-whistles/youtrack/branch.rb

@@ -1,3 +1,4 @@
+require 'readline'
 require_relative '../app'
 require_relative '../youtrack/api'
 require_relative '../youtrack/ticket'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: git-whistles
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: 1.4.2
 platform: ruby
 authors:
 - Julien Letessier
 - Pedro Cunha
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,8 +189,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundle/config"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - HISTORY
@@ -243,11 +246,63 @@ files:
 - spec/lib/git-whistles/youtrack/branch_spec.rb
 - spec/spec_helper.rb
 - spec/support/vcr_helper.rb
+- vendor/cache/activesupport-4.2.11.3.gem
+- vendor/cache/addressable-2.8.1.gem
+- vendor/cache/builder-3.2.4.gem
+- vendor/cache/coderay-1.1.3.gem
+- vendor/cache/concurrent-ruby-1.1.10.gem
+- vendor/cache/crack-0.4.5.gem
+- vendor/cache/diff-lcs-1.5.0.gem
+- vendor/cache/domain_name-0.5.20190701.gem
+- vendor/cache/hashdiff-1.0.1.gem
+- vendor/cache/hashie-5.0.0.gem
+- vendor/cache/http-accept-1.7.0.gem
+- vendor/cache/http-cookie-1.0.5.gem
+- vendor/cache/httparty-0.20.0.gem
+- vendor/cache/i18n-0.9.5.gem
+- vendor/cache/jira-ruby-1.0.0.gem
+- vendor/cache/method_source-1.0.0.gem
+- vendor/cache/mime-types-3.4.1.gem
+- vendor/cache/mime-types-data-3.2022.0105.gem
+- vendor/cache/mini_portile2-2.8.0.gem
+- vendor/cache/minitest-5.16.3.gem
+- vendor/cache/multi_xml-0.6.0.gem
+- vendor/cache/multipart-post-2.2.3.gem
+- vendor/cache/netrc-0.11.0.gem
+- vendor/cache/nokogiri-1.13.8-arm64-darwin.gem
+- vendor/cache/nokogiri-1.13.8-x86_64-linux.gem
+- vendor/cache/nokogiri-happymapper-0.9.0.gem
+- vendor/cache/oauth-0.6.2.gem
+- vendor/cache/pivotal-tracker-0.5.13.gem
+- vendor/cache/pry-0.14.1.gem
+- vendor/cache/pry-nav-1.0.0.gem
+- vendor/cache/public_suffix-5.0.0.gem
+- vendor/cache/racc-1.6.0.gem
+- vendor/cache/rake-13.0.6.gem
+- vendor/cache/rest-client-2.1.0.gem
+- vendor/cache/rexml-3.2.5.gem
+- vendor/cache/rspec-3.11.0.gem
+- vendor/cache/rspec-core-3.11.0.gem
+- vendor/cache/rspec-expectations-3.11.1.gem
+- vendor/cache/rspec-mocks-3.11.1.gem
+- vendor/cache/rspec-support-3.11.1.gem
+- vendor/cache/snaky_hash-2.0.1.gem
+- vendor/cache/sync-0.5.0.gem
+- vendor/cache/term-ansicolor-1.7.1.gem
+- vendor/cache/thread_safe-0.3.6.gem
+- vendor/cache/tins-1.31.1.gem
+- vendor/cache/tzinfo-1.2.10.gem
+- vendor/cache/unf-0.1.4.gem
+- vendor/cache/unf_ext-0.0.8.2.gem
+- vendor/cache/vcr-6.1.0.gem
+- vendor/cache/version_gem-1.1.1.gem
+- vendor/cache/webmock-3.18.1.gem
+- vendor/cache/youtrack-0.0.11.gem
 homepage: http://github.com/mezis/git-whistles
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -262,9 +317,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: 'A few helpers for classic Git workflows: makes branching and merging, PO
   file handling, issuing pull requests slightly simpler.'