gh-cards 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffcb44c41e909ba458443b3c8ca7e5b4542da1b97e117f7035e8e8aa500f4e78
-  data.tar.gz: 2177a0f6725b21a7e96d3bae81d20cf9116000e366e1b9ed4871a55d7eb3547f
+  metadata.gz: b47409d11ef9ddeb07af9f1f71b33ebffb1f8dd5ccd579ba4100f58ca66db65b
+  data.tar.gz: 21e69c6a6282fe57c3520ce17be96c2e2d1ad9a3d8d80758c44d4b469ff5799f
 SHA512:
-  metadata.gz: 6592bb2490b22cff266d1c897e61e7ea9acdd5521ede7d398c906480cd6a4ae1cf5ae8f4d36365118dc164be663b69bd5ee1fa2d84c925125e75011f057d41a4
-  data.tar.gz: 330ce1d2aeb424a0332fda8acf1773273635e64e042d4c248ff1f4fa0ae1bc09470a1418a2713a8dcad869ce9aaa9d04504c9f14817ce38cc584da6316f0c92d
+  metadata.gz: 9d002133e26ed5db39afa9bcab1070ee36dccf79c8ed5031c081c45b6b62ac71129b0126843d6ac7e6d3ff455608615a83797afbcce69a335de2f32dfb9cb360
+  data.tar.gz: 666d1625fc9f4ab2f30043f70e0c89e3d757f0537c232bd0a99b7993d6e7bbb4fb50e7152bcb1deba3e93d773bbfb7f431cc8db071f6e7fb9e7071cd0bdd905e

data/.gitignore

@@ -7,3 +7,4 @@
 /spec/reports/
 /tmp/
 *.gem
+*.lock

data/.ruby-version

@@ -0,0 +1 @@
+2.6.5

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # 0.2.0
 
+General code cleanup
+
+# 0.2.0
+
 Add an issues milestone to card objects and update default template
 
 # 0.1.0

data/README.md

@@ -101,7 +101,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/gh-cards. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/devopsmakers/gh-cards. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -109,4 +109,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Gh::Cards project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/gh-cards/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Gh::Cards project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/devopsmakers/gh-cards/blob/master/CODE_OF_CONDUCT.md).

data/lib/gh/cards/cli.rb

@@ -13,7 +13,7 @@ module Gh
 
       desc "generate", "Generate your Github issue cards HTML file"
       def generate
-        Gh::Cards.generate options[:template],  options[:directory], options[:repo]
+        Gh::Cards.generate(options[:template], options[:directory], options[:repo])
       end
     end
   end

data/lib/gh/cards/version.rb

@@ -1,5 +1,5 @@
 module Gh
   module Cards
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/gh/cards.rb

@@ -10,93 +10,88 @@ module Gh
     $user_names_cache = {}
 
     def self.generate(template, directory, repo)
-      @template = template
-      @directory = directory
-      @repo = repo || _get_this_repo()
+      repo = repo || _get_this_repo()
+      last_issue = _get_last_issue(directory)
 
-      @last_issue = _get_last_issue(@directory)
+      client = Octokit::Client.new(:netrc => true)
+      client.auto_paginate = true
+      cards = _get_cards_from_gh_issues(client, repo, last_issue)
 
-      @cards = _get_cards_from_gh_issues(@last_issue)
+      if cards.empty?
+        exit_msg = "No issues found in #{repo}"
+        if last_issue > 0
+          exit_msg << "\n\nFile: #{directory}/last shows the last issue generated as #{last_issue}"
+          exit_msg << "\nTo reset and generate all cards, delete #{directory}/last and re-run"
+        end
+        puts exit_msg
+        exit 0
+      end
 
-      _generate_cards_html(@template, @directory, @repo, @cards)
+      puts "Found #{cards.length} new #{"issue".pluralize cards.length} in #{repo} to generate cards from"
 
-      _set_last_issue(@directory, @cards)
+      _generate_cards_html(template, directory, repo, cards)
 
-      system("open", "#{@directory}/cards.html")
+      _set_last_issue(directory, cards)
+
+      system("open", "#{directory}/cards.html")
       puts "Done!"
     end
 
     def self._get_this_repo
-      @repo_regex = /^(https|git)(:\/\/|@)([^\/:]+)[\/:]([^\/:]+)\/(.+).git$/
+      repo_regex = /^(https|git)(:\/\/|@)([^\/:]+)[\/:]([^\/:]+)\/(.+).git$/
       begin
-        @g = Git.open('.')
+        g = Git.open('.')
       rescue
         abort("Unable to detect git repo! Make sure you're in a repo or use the --repo option")
       end
-      @r = @g.remote('origin').url.match(@repo_regex)
-      return "#{@r[4]}/#{@r[5]}"
+      r = g.remote('origin').url.match(repo_regex)
+      return "#{r[4]}/#{r[5]}"
     end
 
     def self._get_last_issue(directory)
-      @last_file = "#{directory}/last"
+      last_file = "#{directory}/last"
 
       if ! File.directory?(directory)
         FileUtils.mkdir_p directory
       end
 
-      if ! File.file?(@last_file)
-        File.open(@last_file, "w") do |f|
+      if ! File.file?(last_file)
+        File.open(last_file, "w") do |f|
           f.write(0)
         end
       end
 
-      @last_issue_number = File.open(@last_file, "r"){ |file| file.read }
-      return @last_issue_number.to_i
-
+      last_issue_number = File.open(last_file, "r"){ |file| file.read }
+      return last_issue_number.to_i
     end
 
     def self._set_last_issue(directory, cards)
-      @last_file = "#{directory}/last"
-      File.open(@last_file, "w") do |f|
-        f.write(@cards[0][:number])
+      last_file = "#{directory}/last"
+      File.open(last_file, "w") do |f|
+        f.write(cards[0][:number])
       end
     end
 
-    def self._get_cards_from_gh_issues(last_issue)
-      @client = Octokit::Client.new(:netrc => true)
-      @client.auto_paginate = true
-
-      @issues = @client.list_issues @repo
-      @issues.reject!{ |issue| issue[:number] <= last_issue or issue[:pull_request]}
+    def self._get_cards_from_gh_issues(client, repo, last_issue)
+      issues = client.list_issues repo
+      issues.reject!{ |issue| issue[:number] <= last_issue or issue[:pull_request]}
 
-      if @issues.empty?
-        @exit_msg = "No issues found in #{@repo}"
-        if last_issue > 0
-          @exit_msg << "\n\nFile: #{@directory}/last shows the last issue generated as #{last_issue}"
-          @exit_msg << "\nTo reset and generate all cards, delete #{@directory}/last and re-run"
-        end
-        puts @exit_msg
-        exit 0
-      end
-
-      puts "Found #{@issues.length} new #{"issue".pluralize @issues.length} in #{@repo} to generate cards from"
-
-      @cards = @issues.map do |issue|
+      cards = issues.map do |issue|
         {
           :title => issue[:title],
           :number => issue[:number],
           :labels => issue[:labels].map{|label| {:name => label[:name], :color => label[:color]}},
           :milestone => issue[:milestone] ? issue[:milestone][:title] : nil,
-          :created_by => _get_gh_user_name(issue[:user][:login]),
+          :created_by => _get_gh_user_name(client, issue[:user][:login]),
           :created_at => issue[:created_at]
         }
       end
-      return @cards
+      return cards
     end
 
-    def self._get_gh_user_name(user_login)
+    def self._get_gh_user_name(client, user_login)
       if $user_names_cache[user_login.to_sym].nil?
-        $user_names_cache[user_login.to_sym] = @client.user(user_login)[:name] || user_login
+        $user_names_cache[user_login.to_sym] = client.user(user_login)[:name] || user_login
       end
       return $user_names_cache[user_login.to_sym]
     end
@@ -104,20 +99,17 @@ module Gh
     def self._generate_cards_html(template, directory, repo, cards)
 
       if File.file?("#{__dir__}/../../templates/#{template}.html.erb")
-        @template_file = "#{__dir__}/../../templates/#{template}.html.erb"
+        template_file = "#{__dir__}/../../templates/#{template}.html.erb"
       elsif File.file?("#{__dir__}/../../templates/#{template}")
-        @template_file = "#{__dir__}/../../templates/#{template}"
+        template_file = "#{__dir__}/../../templates/#{template}"
       elsif File.file?(template)
-        @template_file = template
+        template_file = template
       else
         abort("Unable to find template: #{template}")
       end
 
-      @cards = cards
-      @repo = repo
-
       puts "Generating cards using template: #{template}"
-      erb = ERB.new(File.read(@template_file))
+      erb = ERB.new(File.read(template_file))
       File.write("#{directory}/cards.html", erb.result(binding))
     end
   end

data/templates/default.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <title>Cards for <%= @repo %></title>
+  <title>Cards for <%= repo %></title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
@@ -20,11 +20,11 @@
     <div class="row">
       <div class="col-12">
         <div class="card-deck">
-        <% @cards.each_slice(3) do |slice| %>
+        <% cards.each_slice(3) do |slice| %>
           <% slice.each do |card| %>
           <div class="card">
             <div class="card-header">
-              <%= @repo.split('/')[-1] %>
+              <%= repo.split('/')[-1] %>
             </div>
             <div class="card-body">
               <h4 class="card-title"><span class="font-weight-bold">#<%= card[:number] %></span> <%= card[:title] %></h4>
@@ -35,8 +35,8 @@
               <% if card[:labels].length > 0 %>
               <h6 class="text-secondary">Labels:</h6>
               <div class="small text-secondary test-lowercase">
-                <% for @label in card[:labels] %>
-                <%= @label[:name] %><br />
+                <% for label in card[:labels] %>
+                <%= label[:name] %><br />
                 <% end %>
               </div>
               <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gh-cards
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tim Birkett
@@ -133,6 +133,7 @@ files:
 - ".gh-cards/cards.html"
 - ".gh-cards/last"
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md