waff 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 744646fcc820324175c80bc0ada8766f293ba881cbddf84528235fd03d718d06
-  data.tar.gz: 840886eb82d25a476059d99905cc20fa9568f2cb861fade621e85f4daf2f9f2f
+  metadata.gz: ae6ede544fb5577239ae319898d03cbe1842fa98121e5aca07115987c5ec10a1
+  data.tar.gz: 90868e9d22cdc6cf444670512b84c41a2a7680426e91d66609ee0bec8c156315
 SHA512:
-  metadata.gz: db425a59c78f44c59740e4dcce60f4e81842accc78a8fa489c45fd291b91b4f55527481afcf91e3ad3b39f0c9488ccc9fab15a60e60ae2abe29619108cab361c
-  data.tar.gz: 91e4807ebb8852b8e07f007060867e7360a9502d930cb0ef0b29d2d6016df932507a7a35036da6a6c05eb9a5b1b1890ecbae95e47e94d98c43d6dc81da772240
+  metadata.gz: bc7a20506959df2ac67dd68b95f46d93df12eb261bf1c534019fd23ca360fa39795175aa5c91a9bee401b0616d560ecc7e4ea658a9810afc223b89d20d6d7df4
+  data.tar.gz: 7a9ae012e20fb29ff6877b1df1cc6d1f63c49eea1dafe370b72813a826fde0dd3903c3b944734fcd748ce0db5aab84a8ece5390982c2034dbefa31796fec2b82

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    waff (0.0.3)
+    waff (0.0.6)
       httparty (~> 0.16)
 
 GEM

data/bin/waff

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
 
 require_relative '../lib/waff'
+
+Waff::Commander.call ARGV

data/lib/waff/commander.rb

@@ -0,0 +1,25 @@
+module Waff
+  class Commander
+    class << self
+      def call params
+        LocalRepository.check_existence!
+        Config.init_config!
+
+        command = params.shift
+
+        case command
+        when 'take'
+          Commands::Take.call(params)
+        when 'pause'
+          Commands::Pause.call(params)
+        when 'list'
+          Commands::List.call(params)
+        when 'show'
+          Commands::Show.call(params)
+        else
+          puts HELP_TEXT
+        end
+      end
+    end
+  end
+end

data/lib/waff/commands/command.rb

@@ -0,0 +1,15 @@
+module Waff
+  module Commands
+    class Command
+      attr_reader :params
+
+      def self.call *args
+        new.call(*args)
+      end
+
+      def github_repo
+        @github_repo ||= Repository.new
+      end
+    end
+  end
+end

data/lib/waff/commands/list.rb

@@ -0,0 +1,24 @@
+require_relative 'command'
+
+module Waff
+  module Commands
+    class List < Command
+      def call params
+        ready_issues = github_repo.get_open_issues 'ready'
+        ready_issues += github_repo.get_open_issues 'to do'
+        puts "Ready: \n\n"
+        ready_issues.each do |issue|
+          puts "##{issue.number}\t #{issue.title}"
+        end
+        puts
+
+        in_progress_issues = github_repo.get_open_issues 'in progress'
+        puts "In progress: \n\n"
+        in_progress_issues.each do |issue|
+          puts "##{issue.number}\t #{issue.title}"
+        end
+        puts
+      end
+    end
+  end
+end

data/lib/waff/commands/pause.rb

@@ -0,0 +1,14 @@
+require_relative 'command'
+
+module Waff
+  module Commands
+    class Pause < Command
+      def call params
+        issue_number = params.shift
+        issue = github_repo.get_issue issue_number
+
+        issue.mark_ready!
+      end
+    end
+  end
+end

data/lib/waff/commands/show.rb

@@ -0,0 +1,16 @@
+require_relative 'command'
+
+module Waff
+  module Commands
+    class Show < Command
+      def call params
+        issue_number = params.shift || LocalRepository.current_issue_number
+        issue_number || raise('No issue number given as argument or found as current branch')
+        issue = github_repo.get_issue issue_number
+
+        puts "##{issue.number}\t #{issue.title}\n\n"
+        puts issue.body
+      end
+    end
+  end
+end

data/lib/waff/commands/take.rb

@@ -0,0 +1,16 @@
+require_relative 'command'
+
+module Waff
+  module Commands
+    class Take < Command
+      def call params
+        issue_number = params.shift
+        issue = github_repo.get_issue issue_number
+
+        issue.create_local_branch!
+        issue.assign_to_self!
+        issue.mark_in_progress!
+      end
+    end
+  end
+end

data/lib/waff/config.rb

@@ -0,0 +1,60 @@
+module Waff
+  class Config
+    REMOTE_NOT_FOUND = <<-EOF
+      Can't find owner and repository. Make sure the remote name is correctly set on the configuration file.
+    EOF
+
+    class << self
+      def user
+        config['user']
+      end
+
+      def token
+        config['token']
+      end
+
+      def remote
+        config['remote']
+      end
+
+      def get_owner_and_repo
+        url = `git config --get remote.#{remote}.url`.strip
+        url[/:(.*)\.git/, 1] || raise(REMOTE_NOT_FOUND)
+      end
+
+      def init_config!
+        return if File.exist?(CONFIG_FILE)
+
+        puts "No config file detected (#{CONFIG_FILE}). Will generate one now in current directory."
+        print 'Github username: '
+        user = $stdin.gets
+        print 'Github password/personal token: '
+        token = $stdin.gets
+        print 'Git remote (leave empty for "origin"): '
+        remote = $stdin.gets.strip
+        remote = remote.empty? ? 'origin' : remote
+
+        # Write config file
+        File.open(CONFIG_FILE, 'w') do |file|
+          file.puts "user: #{user}"
+          file.puts "token: #{token}"
+          file.puts "remote: #{remote}"
+        end
+
+        # Write exclude file
+        FileUtils.mkdir_p(File.dirname(EXCLUDE_FILE))
+        File.open(EXCLUDE_FILE, 'a+') do |file|
+          unless file.read =~ /^#{CONFIG_FILE}$/
+            file.puts CONFIG_FILE
+          end
+        end
+      end
+
+      private
+
+      def config
+        @config ||= YAML.load_file(CONFIG_FILE)
+      end
+    end
+  end
+end

data/lib/waff/issue.rb

@@ -0,0 +1,49 @@
+module Waff
+  class Issue
+    attr_reader :repository, :number, :title, :labels, :body
+
+    def initialize(repository, data)
+      @repository = repository
+      @number = data['number']
+      @title = data['title']
+      @body = data['body']
+      parse_labels data
+    end
+
+    def create_local_branch!
+      branch_name = "#{number}-#{slug}"
+      puts "Creating branch #{branch_name}"
+      `git checkout -b '#{branch_name}'`
+    end
+
+    def assign_to_self!
+      repository.assign_issue number
+    end
+
+    def mark_in_progress!
+      labels.delete 'ready'
+      labels.delete 'to do'
+      labels << 'in progress'
+
+      repository.export_labels self
+    end
+
+    def mark_ready!
+      labels << 'ready'
+      labels << 'to do'
+      labels.delete 'in progress'
+
+      repository.export_labels self
+    end
+
+    private
+
+    def parse_labels(data)
+      @labels = data['labels'].map { |label| label['name'] }
+    end
+
+    def slug
+      title.downcase.strip.tr(' ', '-').gsub(/[^\w-]/, '')
+    end
+  end
+end

data/lib/waff/local_repository.rb

@@ -0,0 +1,16 @@
+module Waff
+  class LocalRepository
+    class << self
+      def current_issue_number
+        branch_name = `git rev-parse --abbrev-ref HEAD`
+        branch_name[/^#?(\d+)-/, 1]
+      end
+
+      def check_existence!
+        unless File.exist?('.git')
+          raise 'No git repository found. Please move to the root of your project.'
+        end
+      end
+    end
+  end
+end

data/lib/waff/repository.rb

@@ -0,0 +1,66 @@
+module Waff
+  class Repository
+    include HTTParty
+
+    def initialize
+      @user = Config.user
+      @token = Config.token
+      @owner_and_repo = Config.get_owner_and_repo
+
+      self.class.basic_auth @user, @token
+    end
+
+    def get_issue(number)
+      response = self.class.get github_url ['issues', number]
+
+      if response.success?
+        Issue.new(self, response.parsed_response)
+      else
+        puts 'ERROR requesting issue'
+        puts response.body
+      end
+    end
+
+    def assign_issue(number)
+      url = github_url ['issues', number, 'assignees']
+      response = self.class.post url, body: { assignees: [@user] }.to_json
+      if response.success?
+        puts "Successfully assigned issue ##{number} to #{@user}."
+      else
+        puts 'ERROR assigning user to issue'
+        puts response.body
+      end
+    end
+
+    def export_labels issue
+      url = github_url ['issues', issue.number, 'labels']
+      response = self.class.put url, body: issue.labels.to_json
+      if response.success?
+        puts "Successfully assigned #{issue.labels.inspect} labels to  ##{issue.number}"
+      else
+        puts 'ERROR setting issue labels'
+        puts response.body
+      end
+    end
+
+    def get_open_issues label
+      response = self.class.get github_url(['issues']), query: { labels: label }
+
+      if response.success?
+        issues_data = response.parsed_response
+        issues_data.reject! { |data| data['pull_request'] }
+        issues_data.map { |data| Issue.new(self, data) }
+      else
+        puts 'ERROR requesting open issues'
+        puts response.body
+      end
+    end
+
+    private
+
+    def github_url(nodes)
+      subpath = nodes.join '/'
+      "https://api.github.com/repos/#{@owner_and_repo}/" + subpath
+    end
+  end
+end

data/lib/waff/version.rb

@@ -0,0 +1,3 @@
+module Waff
+  VERSION = '0.0.6'.freeze
+end

data/lib/waff.rb

@@ -1,11 +1,15 @@
 require 'fileutils'
 require 'httparty'
-require_relative 'core.rb'
 
-CONFIG_FILE = '.waff.yml'
-EXCLUDE_FILE = '.git/info/exclude'
+Dir[File.join(__dir__, 'waff', '**/*.rb')].each { |file| require file }
+
+module Waff
+  CONFIG_FILE = '.waff.yml'
+  EXCLUDE_FILE = '.git/info/exclude'
+
+  HELP_TEXT = <<-EOF
+Waff version #{Waff::VERSION}
 
-HELP_TEXT = <<-EOF
 Usage:
 
 waff [command] [params]
@@ -17,82 +21,6 @@ waff show         -- Shows description of current issue (determined by current b
 waff show number  -- Shows description of a given issue
 waff take number  -- Sets the issue in progress, assigns it to yourself, and creates a branch for it
 waff pause number -- Sets the issue to ready state
-EOF
-
-def init_config
-  unless File.exist?(CONFIG_FILE)
-    puts "No config file detected (#{CONFIG_FILE}). Will generate one now in current directory."
-    print 'Github username: '
-    user = $stdin.gets
-    print 'Github password/personal token: '
-    token = $stdin.gets
-    print 'Git remote (leave empty for "origin"): '
-    remote = $stdin.gets.strip
-    remote = remote.empty? ? 'origin' : remote
-
-    # Write config file
-    File.open(CONFIG_FILE, 'w') do |file|
-      file.puts "user: #{user}"
-      file.puts "token: #{token}"
-      file.puts "remote: #{remote}"
-    end
-
-    # Write exclude file
-    FileUtils.mkdir_p(File.dirname(EXCLUDE_FILE))
-    File.open(EXCLUDE_FILE, 'a+') do |file|
-      unless file.read =~ /^#{CONFIG_FILE}$/
-        file.puts CONFIG_FILE
-      end
-    end
-
-  end
-end
-
-def check_local_repository_exists
-  unless File.exist?('.git')
-    puts 'No git repository found. Please move to the root of your project.'
-    exit
-  end
-end
-
-check_local_repository_exists
-init_config
-
-
-command = ARGV[0]
-issue_number = ARGV[1]
-repo = Repository.new
-
-case command
-when 'take'
-  issue = repo.get_issue issue_number
-  issue.create_local_branch!
-  issue.assign_to_self!
-  issue.mark_in_progress!
-when 'pause'
-  issue = repo.get_issue issue_number
-  issue.mark_ready!
-when 'list'
-  ready_issues = repo.get_open_issues 'ready'
-  ready_issues += repo.get_open_issues 'to do'
-  puts "Ready: \n\n"
-  ready_issues.each do |issue|
-    puts "##{issue.number}\t #{issue.title}"
-  end
-  puts
+  EOF
 
-  in_progress_issues = repo.get_open_issues 'in progress'
-  puts "In progress: \n\n"
-  in_progress_issues.each do |issue|
-    puts "##{issue.number}\t #{issue.title}"
-  end
-  puts
-when 'show'
-  issue_number ||= LocalRepository.current_issue_number
-  issue_number || raise('No issue number given as argument or found as current branch')
-  issue = repo.get_issue issue_number
-  puts "##{issue.number}\t #{issue.title}\n\n"
-  puts issue.body
-else
-  puts HELP_TEXT
 end

data/waff.gemspec

@@ -1,7 +1,10 @@
 # coding: utf-8
+
+require_relative 'lib/waff/version'
+
 Gem::Specification.new do |spec|
   spec.name          = "waff"
-  spec.version       = "0.0.4"
+  spec.version       = Waff::VERSION
   spec.authors       = ["Armando Andini"]
   spec.email         = ["armando.andini@gmail.com"]
   spec.summary       = %q{Helps you with github flow based on Waffle tool}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waff
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Armando Andini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -35,13 +35,18 @@ files:
 - Gemfile
 - Gemfile.lock
 - bin/waff
-- lib/config.rb
-- lib/core.rb
-- lib/helper.rb
-- lib/issue.rb
-- lib/local_repository.rb
-- lib/repository.rb
 - lib/waff.rb
+- lib/waff/commander.rb
+- lib/waff/commands/command.rb
+- lib/waff/commands/list.rb
+- lib/waff/commands/pause.rb
+- lib/waff/commands/show.rb
+- lib/waff/commands/take.rb
+- lib/waff/config.rb
+- lib/waff/issue.rb
+- lib/waff/local_repository.rb
+- lib/waff/repository.rb
+- lib/waff/version.rb
 - waff.gemspec
 homepage: https://github.com/antico5/waff
 licenses:

data/lib/config.rb

@@ -1,30 +0,0 @@
-class Config
-  REMOTE_NOT_FOUND = <<-EOF
-  Can't find owner and repository. Make sure the remote name is correctly set on the configuration file.
-  EOF
-
-  class << self
-    def user
-      config['user']
-    end
-
-    def token
-      config['token']
-    end
-
-    def remote
-      config['remote']
-    end
-
-    def get_owner_and_repo
-      url = `git config --get remote.#{remote}.url`.strip
-      url[/:(.*)\.git/, 1] || raise(REMOTE_NOT_FOUND)
-    end
-
-    private
-
-    def config
-      @config ||= YAML.load_file(CONFIG_FILE)
-    end
-  end
-end

data/lib/core.rb

@@ -1,5 +0,0 @@
-require_relative 'config'
-require_relative 'helper'
-require_relative 'repository'
-require_relative 'local_repository'
-require_relative 'issue'

data/lib/helper.rb

@@ -1,5 +0,0 @@
-class Helper
-  def self.slug(title)
-    title.downcase.strip.tr(' ', '-').gsub(/[^\w-]/, '')
-  end
-end

data/lib/issue.rb

@@ -1,43 +0,0 @@
-class Issue
-  attr_reader :repository, :number, :title, :labels, :body
-
-  def initialize(repository, data)
-    @repository = repository
-    @number = data['number']
-    @title = data['title']
-    @body = data['body']
-    parse_labels data
-  end
-
-  def create_local_branch!
-    branch_name = "#{number}-#{Helper.slug title}"
-    puts "Creating branch #{branch_name}"
-    `git checkout -b '#{branch_name}'`
-  end
-
-  def assign_to_self!
-    repository.assign_issue number
-  end
-
-  def mark_in_progress!
-    labels.delete 'ready'
-    labels.delete 'to do'
-    labels << 'in progress'
-
-    repository.export_labels self
-  end
-
-  def mark_ready!
-    labels << 'ready'
-    labels << 'to do'
-    labels.delete 'in progress'
-
-    repository.export_labels self
-  end
-
-  private
-
-  def parse_labels(data)
-    @labels = data['labels'].map { |label| label['name'] }
-  end
-end

data/lib/local_repository.rb

@@ -1,8 +0,0 @@
-class LocalRepository
-  class << self
-    def current_issue_number
-      branch_name = `git rev-parse --abbrev-ref HEAD`
-      branch_name[/^#?(\d+)-/, 1]
-    end
-  end
-end

data/lib/repository.rb

@@ -1,64 +0,0 @@
-class Repository
-  include HTTParty
-
-  def initialize
-    @user = Config.user
-    @token = Config.token
-    @owner_and_repo = Config.get_owner_and_repo
-
-    self.class.basic_auth @user, @token
-  end
-
-  def get_issue(number)
-    response = self.class.get github_url ['issues', number]
-
-    if response.success?
-      Issue.new(self, JSON.parse(response.body))
-    else
-      puts 'ERROR requesting issue'
-      puts response.body
-    end
-  end
-
-  def assign_issue(number)
-    url = github_url ['issues', number, 'assignees']
-    response = self.class.post url, body: { assignees: [@user] }.to_json
-    if response.success?
-      puts "Successfully assigned issue ##{number} to #{@user}."
-    else
-      puts 'ERROR assigning user to issue'
-      puts response.body
-    end
-  end
-
-  def export_labels issue
-    url = github_url ['issues', issue.number, 'labels']
-    response = self.class.put url, body: issue.labels.to_json
-    if response.success?
-      puts "Successfully assigned #{issue.labels.inspect} labels to  ##{issue.number}"
-    else
-      puts 'ERROR setting issue labels'
-      puts response.body
-    end
-  end
-
-  def get_open_issues label
-    response = self.class.get github_url(['issues']), query: { labels: label }
-
-    if response.success?
-      issues_data = JSON.parse response.body
-      issues_data.reject! { |data| data['pull_request'] }
-      issues_data.map { |data| Issue.new(self, data) }
-    else
-      puts 'ERROR requesting open issues'
-      puts response.body
-    end
-  end
-
-  private
-
-  def github_url(nodes)
-    subpath = nodes.join '/'
-    "https://api.github.com/repos/#{@owner_and_repo}/" + subpath
-  end
-end