gub 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f404a3e769c6040f96d2d43c64b82f7e180f6b02
-  data.tar.gz: 3340417a13ba2a93d51ae60e19531fc1ceb8f4ae
+  metadata.gz: 6cf46f045e6d318e334b3089a07dd110040a6c88
+  data.tar.gz: db36b2b231f0b26cc7516c1b36715b72b5b44942
 SHA512:
-  metadata.gz: b92068f3633107ff5751b36962cba0edac2231e5b275840051581731419788471053a34485c61d55346043814af83d2ad9eff821ec9e51c91cb15140c0272eae
-  data.tar.gz: 134f1fa532b2aea43ab9fd286b570990a30733dc059953df9d950c5accf2fd28a9f8f9103f6b4d7a1358c3cd42841c2e67814f59781776f9bc1ee1551988551e
+  metadata.gz: abe07fd50a43871dc64bcf8d8005af413083beb885417cfd7e2f0d19ef966fbe8ae0e8447a4231f3a3312c4feaaffe03e381d7b56906d09c8a0894d058b4677a
+  data.tar.gz: 8567de1aa0f2540500f6c4e7b86bab3ba8d11abe86c9f48a3ce0c7b4a961a36c65f294bf40023e57639982372d4354cb64215a3cc6feec2a8d017dda6e559c9f

data/bin/gub

@@ -1,9 +1,11 @@
 #!/usr/bin/env ruby
 
-$:<< File.expand_path("~/Projects/gub/lib/")
+debug = false
+if ENV.include?('GUB_ENV') && ENV['GUB_ENV'] == 'development'
+  debug = true
+  $:<< File.expand_path("~/Projects/gub/lib/")
+end
 
-require 'rubygems'
 require 'gub'
-
 # Start our command line interface
-Gub.start
+Gub.start(debug)

data/gub.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor'
   spec.add_dependency 'octokit'
   spec.add_dependency 'terminal-table'
+  spec.add_dependency 'highline'
 end

data/lib/gub/cli.rb

@@ -1,19 +1,20 @@
 require 'gub/version'
 require 'thor'
 require 'terminal-table'
+require 'highline'
 
 module Gub
   class CLI < Thor
-    default_task :info
+    include Thor::Actions
+    
+    default_task :version
     
     desc 'publish', 'Publish a local repo to Github'
     def publish
-      setup
     end
   
     desc 'repos', 'List Github repositories'
     def repos
-      setup
       rows = []
       id = 0
       Gub.github.repos.list.each do |repo|
@@ -26,25 +27,43 @@ module Gub
           rows << [id, repo.full_name]
         end
       end
-      puts table rows, ['#', 'Repository']
+      say table rows, ['#', 'Repository']
     end
   
+    desc 'issue [id]', 'Show a Github issue'
+    def issue(id)
+      repository = Gub::Repository.new
+      issue = repository.issue(id)
+      rows = []
+      rows << ['Status:', issue.state]
+      rows << ['Milestone:', issue.milestone.title]
+      rows << ['Author:', issue.user.login]
+      rows << ['Assignee:', (issue.assignee.nil? ? '-' : issue.assignee.login)]
+      rows << ['Description:', word_wrap(issue.body, line_width: 70)]
+      Gub.log.info "Hint: use 'gub start #{id}' to start working on this issue."
+      say table rows, ["Issue ##{id}:", issue.title]
+    end
+    
     desc 'issues', 'List Github issues'
-    method_options all: :boolean, default: false
+    method_option :all, type: :boolean, aliases: '-a', desc: 'Issues in all repositories'
+    method_option :mine, type: :boolean, aliases: '-m', desc: 'Only issues assigned to me'
     def issues
-      setup
-      if options.all || repo_full_name.nil?
-        puts "Listing all issues:"
-        issues = Gub.github.issues
+      args = {}
+      repository = Gub::Repository.new
+      if options.mine
+        args[:assignee] = Gub.github.user.login
+      end
+      if options.all || repository.full_name.nil?
+        Gub.log.info "Listing issues assigned to you:"
+        issues = Gub.github.user_issues
       else
-        params = {}
-        if parent
-          params[:repo] = parent
+        if repository.has_issues?
+          Gub.log.info "Listing issues for #{repository.full_name}:"
         else
-          params[:repo] = repo_full_name
+          Gub.log.info "Issues disabled #{repository.full_name}."
+          Gub.log.info "Listing issues for #{repository.parent}:"
         end
-        puts "Listing issues for #{params[:repo]}:"
-        issues = Gub.github.issues params
+        issues = repository.issues(args)
       end
       unless issues.nil?
         rows = []
@@ -54,99 +73,109 @@ module Gub
           row << issue.title
           row << issue.user.login
           row << (issue.assignee.nil? ? '' : issue.assignee.login)
+          row << issue.status
           rows << row
         end
-        puts table rows, ['ID', 'Title', 'Author', 'Assignee']
-        puts "Found #{issues.count} issue(s)."
-        puts 'Hint: use "gub start" to start working on an issue.'
+        say table rows, ['ID', 'Title', 'Author', 'Assignee', 'Status']
+        Gub.log.info "Found #{issues.count} issue(s)."
+        Gub.log.info 'Hint: use "gub start" to start working on an issue.'
       end
-    # rescue Octokit::ClientError
-    #   puts 'Issues are disabled for this repository.'
     end
     
-    desc 'start', 'Start working on a Github issue'
+    desc 'start [id]', 'Start working on a Github issue'
     def start id
       if id.nil?
-        puts 'Issue ID required.'
+        Gub.log.fatal 'Issue ID required.'
+        exit 1
       else
-        # Fetch issue to validate it exists
-        issue = Gub.github.issue(repo, id)
-        Gub.github.update_issue repo, issue.number, issue.title, issue.description, { assignee: Gub.github.user.login }
-        sync
-        `git checkout -b issue-#{id}`
+        repository = Repository.new
+        Gub.git.sync
+        repository.assign_issue id
+        Gub.git.checkout('-b', "issue-#{id}")
       end
     end
     
-    desc 'finish', 'Finish working on a Github issue'
+    desc 'finish [id]', 'Finish working on a Github issue'
     def finish id = nil
-      setup
       id ||= `git rev-parse --abbrev-ref HEAD`.split('-').last.to_s.chop
       if id.nil?
-        puts "Unable to guess issue ID from branch name. You might want to specify it explicitly."
+        Gub.log.fatal "Unable to guess issue ID from branch name. You might want to specify it explicitly."
+        exit 1
       else
         issue = Gub.github.issue(repo, id)
-        puts 'Pushing branch...'
-        `git push -q origin issue-#{id}`
-        puts "Creating pull-request for issue ##{id}..."
+        Gub.log.info 'Pushing branch...'
+        Gub.git.push('origin', "issue-#{id}")
+        Gub.log.info "Creating pull-request for issue ##{id}..."
         Gub.github.create_pull_request_for_issue(repo, 'master', "#{user_name}:issue-#{id}", id)
-        `git checkout master`
+        Gub.git.checkout('master')
       end
     end
     
-    desc 'clone', 'Clone a Github repository'
+    desc 'clone [repo]', 'Clone a Github repository'
+    method_option :https, type: :boolean, desc: 'Use HTTPs instead of the default SSH'
     def clone repo
-      `git clone git@github.com:#{repo}`
+      if options.https
+        url = "https://github.com/#{repo}"
+      else
+        url = "git@github.com:#{repo}"
+      end
+      Gub.log.info "Cloning from #{url}..."
+      Gub.git.clone(url)
+      `cd #{repo.split('/').last}`
+      repository = Repository.new
+      repository.add_upstream
+    end
+    
+    desc 'add_upstream', 'Add repo upstream'
+    def add_upstream
+      repository = Repository.new
+      repository.add_upstream
     end
     
     desc 'sync', 'Synchronize fork with upstream repository'
     def sync
-      puts 'Synchroizing with upstream...'
-      `git checkout master`
-      `git fetch -q upstream`
-      `git merge -q upstream/master`
+      Gub.log.info 'Synchroizing with upstream...'
+      Gub.git.sync
     end
     
     desc 'info', 'Show current respository information'
     def info
       repo = Gub::Repository.new
-      puts "Github repository: #{repo.full_name}"
-      puts "Forked from: #{repo.parent}" if repo.parent
+      say "Github repository: #{repo.full_name}"
+      say "Forked from: #{repo.parent}" if repo.parent
+    end
+    
+    desc 'setup', 'Setup Gub for the first time'
+    def setup
+      unless Gub.config.data && Gub.config.data.has_key?('token')
+        hl = HighLine.new
+        username = hl.ask 'Github username: '
+        password = hl.ask('Github password (we will not store this): ') { |q| q.echo = "*" }
+        gh = Gub::Github.new(login: username, password: password)
+        token = gh.create_authorization(scopes: [:user, :repo, :gist], note: 'Gub').token
+        Gub.config.add('token', token)
+      end
     end
     
     desc 'version', 'Show Gub version'
     def version
-      puts Gub::VERSION
+      say Gub::VERSION
     end
     
     
     private
-      def setup
-      end
-    
-      def table rows, header = []
-        Terminal::Table.new :headings => header, :rows => rows
-      end
-    
-      def run command, params = {}
-      end
-    
-      def repo
-        if parent
-          name = parent
-        else
-          name = repo_full_name
-        end
-        name
-      end
-      def repo_full_name
-        `git remote -v | grep origin | grep fetch | awk '{print $2}' | cut -d ':' -f 2`.to_s.chop
-      end
-      def repo_name
-        repo_full_name.split('/').last
-      end
-      def user_name
-        repo_full_name.split('/').first
+    def table rows, header = []
+      Terminal::Table.new :headings => header, :rows => rows
+    end
+      
+    # Source: https://github.com/rails/rails/actionpack/lib/action_view/helpers/text_helper.rb
+    def word_wrap(text, options = {})
+      line_width = options.fetch(:line_width, 80)
+      unless text.nil?
+        text.split("\n").collect do |line|
+          line.length > line_width ? line.gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip : line
+        end * "\n"
       end
-    
+    end  
   end  
 end

data/lib/gub/clients/git.rb

@@ -1,4 +1,43 @@
 module Gub
   class Git
+    attr_accessor :default_options
+    
+    def sync
+      self.checkout('master')
+      self.fetch('upstream')
+      self.merge('upstream/master')
+      self.push('origin', '--all')
+    end
+    
+    def remotes
+      `git remote -v | grep fetch | awk '{print $2}' | cut -d ':' -f 2`.split("\n").split(' ').map(&:chop)
+    end
+    
+    # Due to clone being a Ruby magic method, we have to override it
+    def clone repo, *args
+      self.run('clone', repo, *args)
+    end
+    
+    def method_missing meth, *args, &block
+      self.run(meth, *args)
+    end
+    
+    
+    def run command, *args
+      command = command.to_s
+      default_options = []
+      default_options << '-q'
+      cmd = []
+      cmd << 'git'
+      cmd << command
+      arguments = args
+      unless ['clone', 'remote', 'checkout'].include?(command)
+        arguments = arguments.zip(default_options).flatten!
+      end
+      cmd << arguments.join(' ').to_s
+      cmd_line = cmd.join(' ')
+      Gub.log.debug "Running git command: #{cmd_line}"
+      `#{cmd_line}`
+    end
   end
 end

data/lib/gub/clients/github.rb

@@ -2,8 +2,18 @@ require 'octokit'
 
 module Gub
   class Github
-    def initialize token
-      Octokit::Client.new(access_token: token)
+    attr_accessor :connection
+    
+    def initialize opts
+      @connection = Octokit::Client.new(opts)
+    end
+    
+    def user
+      @connection.user
+    end
+    
+    def method_missing meth, *args, &block
+      @connection.send(meth, *args, &block)
     end
   end
 end

data/lib/gub/config.rb

@@ -1,6 +1,36 @@
 module Gub
   class Config
+    attr_accessor :data
+    
+    def rc
+      File.expand_path("~/.gubrc")
+    end
+    
     def initialize
+      read
+    end
+    
+    def add key, value
+      self.data ||= {}
+      self.data[key] = value
+      self.write
+    end
+    
+    def read
+      if File.exists?(self.rc)
+        self.data = YAML.load_file(self.rc)
+      else
+        self.data = {}
+      end
+    end
+    
+    def write
+      puts data.inspect
+      File.open(self.rc, 'w') { |f| YAML.dump(self.data, f) }
+    end
+    
+    def method_missing meth, *args, &block
+      self.data[meth.to_s] if self.data && self.data.has_key?(meth.to_s)
     end
   end
 end

data/lib/gub/extensions.rb

@@ -1,8 +1,2 @@
-class Hash
-  def symbolize_keys!
-    keys.each do |key|
-      self[(key.to_sym rescue key) || key] = delete(key)
-    end
-    self
-  end
-end
+module Gub
+end

data/lib/gub/logger.rb

@@ -0,0 +1,33 @@
+require 'logger'
+
+module Gub
+  class Logger
+    attr_accessor :log
+    
+    def initialize
+      self.log = ::Logger.new(STDOUT)
+      if Gub.debug
+        self.log.level = ::Logger::DEBUG
+      else
+        self.log.level = ::Logger::INFO
+      end
+      self.log.formatter = proc do |severity, datetime, progname, msg|
+        if ['INFO'].include?(severity)
+          "#{msg}\n"
+        elsif ['FATAL'].include?(severity)
+            "#{severity}: #{msg}\n"
+        else
+          "#{severity} #{progname} #{datetime}: #{msg}\n"
+        end
+      end
+    end
+    
+    def start_debugging
+    end
+    
+    def method_missing meth, *args, &block
+      self.log.send(meth, *args, &block)
+    end
+    
+  end
+end

data/lib/gub/repository.rb

@@ -1,33 +1,74 @@
 module Gub
   class Repository
-    attr_accessor :full_name, :github
+    attr_accessor :full_name, :info
     
     def initialize full_name = nil
       if full_name.nil?
-        @full_name = `git remote -v | grep origin | grep fetch | awk '{print $2}' | cut -d ':' -f 2`.to_s.chop
+        self.full_name = `git remote -v | grep origin | grep fetch | awk '{print $2}' | cut -d ':' -f 2`.to_s.chop
       else
-        @full_name = full_name
+        self.full_name = full_name
       end
-      if @full_name.nil?
-        puts 'Unable to find repo name'
+      if self.full_name.nil? || self.full_name.empty?
+        Gub.log.fatal 'Unable to find repo name'
+        exit 1
       else
-        @github = Gub.github.repo(repo: @full_name)
+        Gub.log.debug "Loading information for #{self.full_name}"
+        @info = Gub.github.repo(repo: self.full_name)
       end
     end
     
-    def issues
-      Gub.github.issues
+    def name
+      @full_name.split('/').last
+    end
+    
+    def has_issues?
+      self.info.has_issues
+    end
+    
+    def issues params = {}
+      issues = []
+      issues << Gub.github.issues(self.full_name, params) if self.has_issues?
+      issues << Gub.github.issues(self.parent, params)
+      issues.flatten!
+    end
+    
+    def issue id
+      if self.has_issues?
+        Gub.github.issue(self.full_name, id)
+      else
+        Gub.github.issue(self.parent, id)
+      end
+    end
+    
+    def assign_issue id, login = nil
+      issue = self.issue(id)
+      assignee = login || Gub.github.user.login
+      if self.has_issues?
+        name = self.full_name
+      else
+        name = self.parent
+      end
+      Gub.github.update_issue name, issue.number, issue.title, issue.body, { assignee: assignee }
     end
     
     def owner
       @full_name.split('/').first
     end
     
+    def add_upstream
+      Gub.git.remote('add', 'upstream', "https://github.com/#{self.parent}")
+    end
+    
     def is_fork?
+      self.info.fork
     end
     
     def parent
-      @github.parent.full_name if @github.parent
+      self.info.parent.full_name if self.info.parent
+    end
+    
+    def sync
+      Gub.git.sync('upstream')
     end
   end
 end

data/lib/gub/setup.rb

@@ -0,0 +1,11 @@
+require 'thor'
+
+module Gub
+  class Setup < Thor
+    default_task :setup
+    
+    desc 'setup', 'Setup Gub for the first time'
+    def setup
+      say 'Hello', :red
+    end
+end

data/lib/gub/version.rb

@@ -1,3 +1,3 @@
 module Gub
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/lib/gub.rb

@@ -6,28 +6,25 @@ require 'gub/clients/git'
 require 'gub/clients/github'
 require 'gub/repository'
 require 'gub/cli'
+require 'gub/config'
+require 'gub/logger'
 
 module Gub
-  def self.config
-    @@config
-  end
-  
-  def self.config=
-    @@config
-  end
-
-  def self.start
-    rc = File.expand_path("~/.gubrc")
-    if File.exists?(rc)
-      @@config = YAML.load_file(rc).symbolize_keys!
+  # TODO: Understand this
+  class << self
+    attr_accessor :debug, :log, :config, :git, :github
+    
+    def start debug
+      @debug = debug
+      # Initialize log first
+      @log = Gub::Logger.new
+      # Now load the congiuration
+      @config = Gub::Config.new
+      # The rest of stuff
+      @git = Gub::Git.new
+      @github = Gub::Github.new(access_token: self.config.token)
+      # Invoke our CLI
+      Gub::CLI.start
     end
-    # @@git = Gub::Git.new
-    Gub::CLI.start
-  end
-  
-  def self.github
-    Gub::Github.new(@@config['token'])
   end
-  
-  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gub
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Omar Abdel-Wahab
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Warning: Heavily Under Development, Still in early alpha'
 email:
 - owahab@gmail.com
@@ -116,7 +130,9 @@ files:
 - lib/gub/clients/github.rb
 - lib/gub/config.rb
 - lib/gub/extensions.rb
+- lib/gub/logger.rb
 - lib/gub/repository.rb
+- lib/gub/setup.rb
 - lib/gub/version.rb
 homepage: ''
 licenses: