straight_line 0.1.1.0 → 0.1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 771987714afd7987ff53d38e65f7b02005c60f9f
-  data.tar.gz: 73a315adf6ef9e36123f910055fe8570b2ad712c
+  metadata.gz: dee8f1abb4db6de0c401f3f4008943ddb3f58e5b
+  data.tar.gz: 6a1914f27db3929a0bd3a7c7eff9fb7e65633e4f
 SHA512:
-  metadata.gz: 9dcbe95744cb5d7d18605d4b52b17dd168c6f0e2d929a1e82314257db14b055554749034e0a35f6e906b022b489840aea388f75d2b930742268fd6cd4a6ffb6d
-  data.tar.gz: 9268dd80b853369d362889cbb5689ed7281dd154af6040d74e56a66ebb176e594c7e8406a1dd1af0498ea579734f979d4319f229dbf686d87bf044779305af99
+  metadata.gz: 83a0e5616ab2d8bf7c57a1cd8072565e4157d581d9a5891f4aa1814d4425037979a81b5ea1edbb584833415fb2073afb693b277ef54178f90db9754a9e0b39b2
+  data.tar.gz: 1626f216dcdcbedfd054e40e5139af55a622dd65c2d064d07e49aa4f33296fb7bac07e3b2b4a07ad10ceee858f663658ed4d205e6a2223b63aa2d5a712e8e780

data/.rubocop.yml

@@ -4,3 +4,9 @@ AllCops:
 
 Metrics/LineLength:
   Max: 85
+
+Metrics/MethodLength:
+  Max: 15
+
+Metrics/AbcSize:
+  Max: 16

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rubocop', require: false
+gem 'simplecov'
 gem 'vcr'
 gem 'version_bumper'
 gem 'webmock'
-gem 'simplecov'

data/README.md

@@ -31,6 +31,13 @@ machine api.github.com
 	login <Your Github username>
 	password <Github API token>
 ```
+
+Note `~/.netrc` needs to have `600` permissions. Do this with the following command:
+
+```bash
+chmod 600 ~/.netrc
+```
+
 ## Usage
 
 The basic workflow of StraightLine is: 

data/VERSION

@@ -1 +1 @@
-0.1.1.0
+0.1.2.0

data/lib/straight_line/common/command.rb

@@ -16,6 +16,8 @@ class Command
     self
   end
 
+  def self.from_file(_file_name); end
+
   def run(return_stderr = false)
     Dir.chdir working_dir do
       command_with_params = "#{@command} #{@args.join ' '}"
@@ -25,21 +27,28 @@ class Command
       else
         res, stderr, status = Open3.capture3(command_with_params)
       end
-      unless status.exitstatus == 0
+      unless status.exitstatus.zero?
         output = return_stderr ? res : "#{res}\n#{stderr}"
         raise ShellError, %(Command `#{command_with_params}` exited with
           status code: #{status.exitstatus}. Command outputted:\n #{output})
       end
 
-      sub_res = ''
-      sub_res = @sub_commands.map do |sub_command|
-        sub_command.run return_stderr
-      end.join("\n") unless @sub_commands.empty?
+      sub_res = run_sub_commands return_stderr
 
       res + "\n" + sub_res
     end
   end
 
+  def run_sub_commands(return_stderr)
+    sub_res = ''
+    unless @sub_commands.empty?
+      sub_res = @sub_commands.map do |sub_command|
+        sub_command.run return_stderr
+      end.join("\n")
+    end
+    sub_res
+  end
+
   def sub_command(command)
     unless command.is_a? Command
       raise ArgumentError, 'command must be of type straight_line/common/command'

data/lib/straight_line/common/configure.rb

@@ -0,0 +1,29 @@
+require 'rake'
+require 'straight_line/common/command'
+
+# Configuration class to add tasks to the straightline rake config
+class Configure
+  def add(name, type, command, opts = {})
+    Rake.application.in_namespace StraightLine::TASK_NAMESPACE do
+      Rake::Task.define_task name => opts[:before] do
+        if type == :shell
+          cmd = Command.new command
+          cmd.run
+        elsif !name.nil?
+          Rake::Task[command].invoke
+        end
+        run_after_commands(opts)
+      end
+    end
+  end
+
+  private
+
+  def run_after_commands(opts)
+    after = opts[:after]
+    return if after.nil?
+    after.each do |task|
+      Rake::Task[task].invoke
+    end
+  end
+end

data/lib/straight_line/common/feature/create.rb

@@ -6,7 +6,7 @@ module Feature
   class Create
     def initialize(feature_name)
       raise UserError, 'Feature name required' unless feature_name
-      raise UserError, "Feature name can't have spaces" if feature_name.match %r[\s]
+      raise UserError, "Feature name can't have spaces" if feature_name =~ /\s/
       @feature_name = feature_name
     end
 

data/lib/straight_line/common/feature/diff.rb

@@ -42,9 +42,7 @@ module Feature
       begin
         GitCommands::Commit.new(title, body).run
       rescue StandardError => e
-        unless e.message.match %r[nothing to commit]
-          raise e
-        end
+        raise e unless e.message =~ /nothing to commit/
       end
       GitCommands::Push.new(feature_name).run
     end
@@ -68,10 +66,10 @@ module Feature
     def extract_params(params, keys)
       keys.map do |key|
         case key
-          when :title
-            params[:title] || last_commit_message
-          else
-            params[key]
+        when :title
+          params[:title] || last_commit_message
+        else
+          params[key]
         end
       end
     end

data/lib/straight_line/common/feature/land.rb

@@ -22,28 +22,33 @@ module Feature
 
     def land(_args = {})
       feature_name = current_feature
-      pull_cmd = GitCommands::Pull.new('master')
-      pull_cmd.run
-      GitCommands::Merge.new(feature_name, 'master').run
-
-      begin
-        GitCommands::Commit.new("Merge master into #{feature_name}", '').run
-      rescue StandardError => e
-        unless e.message.match %r[nothing to commit]
-          raise e
-        end
-      end
+      merge_master_to_feature(feature_name)
       GitCommands::Push.new(feature_name).run
+      merge_feature_to_master(feature_name)
+      GitCommands::Push.new(feature_name, delete: true).run
+      Command.new('git checkout master').run
+      Util.logger.info 'Changes landed to master, on master branch now.'
+    end
+
+    def merge_feature_to_master(feature_name)
       if pull_request_closed?(feature_name)
-        Util.logger.info %{#{feature_name} was merged in github.
-          You're repo is up-to-date with remote}
+        Util.logger.info %(#{feature_name} was merged in github.
+          You're repo is up-to-date with remote)
       else
         GitCommands::Merge.new('master', feature_name).run
         GitCommands::Push.new('master').run
       end
-      GitCommands::Push.new(feature_name, delete: true).run
-      Command.new('git checkout master').run
-      Util.logger.info 'Changes landed to master, on master branch now.'
+    end
+
+    def merge_master_to_feature(feature_name)
+      GitCommands::Pull.new('master').run
+      GitCommands::Merge.new(feature_name, 'master').run
+
+      begin
+        GitCommands::Commit.new("Merge master into #{feature_name}", '').run
+      rescue StandardError => e
+        raise e unless e.message =~ /nothing to commit/
+      end
     end
 
     def pull_request_closed?(feature_name)

data/lib/straight_line/common/feature.rb

@@ -3,12 +3,12 @@ require 'straight_line/common/command'
 module Feature
   def current_feature
     res = Command.new('git')
-              .arg('branch')
-              .run
-              .match(/^\*\s+(.*)/)[1].strip
-    if res.match(/no branch/)
-      raise UserError, %q(A rebase is in process.
-        Finish the rebase, then run the command again)
+                 .arg('branch')
+                 .run
+                 .match(/^\*\s+(.*)/)[1].strip
+    if res =~ /no branch/
+      raise UserError, 'A rebase is in process.
+        Finish the rebase, then run the command again'
     else
       res
     end

data/lib/straight_line/common/git_commands/merge.rb

@@ -16,7 +16,7 @@ module GitCommands
       sub_command merge_command
     end
 
-    def run(*args)
+    def run(*_args)
       super true
 
     rescue ShellError => e

data/lib/straight_line/common/git_commands/push.rb

@@ -21,9 +21,9 @@ module GitCommands
 
       if opts[:delete]
         push_command
-            .arg('origin')
-            .arg('--delete')
-            .arg(branch)
+          .arg('origin')
+          .arg('--delete')
+          .arg(branch)
       elsif !remote_exists
         push_command
           .arg('--set-upstream')

data/lib/straight_line/common/git_commands/rebase.rb

@@ -13,7 +13,7 @@ module GitCommands
       arg branch
     end
 
-    def run(*args)
+    def run(*_args)
       super true
     rescue ShellError => e
       handle_merge_conflict(e)

data/lib/straight_line/common/git_commands.rb

@@ -1,9 +1,12 @@
 require 'straight_line/common/util'
+
+# Util class for common git related actions
 module GitCommands
   def handle_merge_conflict(e)
-    if e.message.match %r[Merge conflict in]
-      Util.logger.error %q(***** Hint: this looks like a merge conflict.
-          Try fixing the conflicts, then run `git add .` and then run the previous command again.)
+    if e.message =~ /Merge conflict in/
+      Util.logger.error '***** Hint: this looks like a merge conflict.
+          Try fixing the conflicts, then run `git add .` and then run the
+          previous command again.'
     end
     raise e
   end

data/lib/straight_line/common/github.rb

@@ -68,8 +68,8 @@ class Github
     prs = pull_requests
     prs.find do |p|
       p.head.ref == feature &&
-          p.head.user.login == Github.github_login &&
-          p.base.ref == 'master'
+        p.head.user.login == Github.github_login &&
+        p.base.ref == 'master'
     end
   end
   make_class :pull_request_for_feature

data/lib/straight_line/common/shell_error.rb

@@ -1,4 +1,3 @@
 
 class ShellError < StandardError
-
-end
+end

data/lib/straight_line/common/util.rb

@@ -1,7 +1,8 @@
 require 'logger'
 
+# Class for global utility methods
 class Util
   def self.logger
     @logger ||= Logger.new STDOUT
   end
-end
+end

data/lib/straight_line.rb

@@ -1,8 +1,14 @@
+require 'straight_line/common/configure'
+require 'rake'
 
 # Base module definition
 module StraightLine
-  # Your code goes here...
-  def self.foo
-    puts 'la'
+  TASK_NAMESPACE = 'sl'.freeze
+  def self.configure
+    yield Configure.new
+  end
+
+  def self.task_namespace
+    Rake::DSL
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: straight_line
 version: !ruby/object:Gem::Version
-  version: 0.1.1.0
+  version: 0.1.2.0
 platform: ruby
 authors:
 - Chris Usick
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,7 @@ files:
 - lib/straight_line/cli/application.rb
 - lib/straight_line/cli/feature.rb
 - lib/straight_line/common/command.rb
+- lib/straight_line/common/configure.rb
 - lib/straight_line/common/feature.rb
 - lib/straight_line/common/feature/create.rb
 - lib/straight_line/common/feature/diff.rb