papa 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baa63ed9a4682f55dff53db355e5af29448bc4ab
-  data.tar.gz: 5513f134da10af2b98048a6c988840ed2668939d
+  metadata.gz: 71de33eed576744cad1400a5d795616b436d8146
+  data.tar.gz: e2a1e530d112d5c819d487c1804e31d119d76cdb
 SHA512:
-  metadata.gz: 22a55a5b2b748a4eb98662d1be83392fc7826e117297127c6ecc31dabddbbd562b30106b64cc2d0036516aa211abe400f618c18be8b56ed96f40565ae9e744a6
-  data.tar.gz: 272a9e587e4b100ed4418397a49a4ff88429aea3277961756dbd323638d3eff1b09108ff4cb114b66c6cd25501ad5958b89b4d6dcfce66bc868ff5a870f6b0be
+  metadata.gz: 1e686d587e3b4d15b6a72da07663e270b97eef6f7bfa5e1c190a4ad234af3a558605005ad9805cb4ad849647f45070de2792fa692ac5cbb35950f56b804e9a76
+  data.tar.gz: f9f40abba6bddd80576d0d8a76b704262415430b712c42a34c207a45fe826d46f8337f7758d3698bec5bcc194eb441fa192047d29fbc1b4e91a7f1a5fb8436c7

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Changelog
+
+## 0.2.0
+* Added `integration [start]`
+* Added `deploy` via larga
+* Hard reset local feature and bugfix branches to remote versions before adding
+
+## 0.1.0
+* Initial release
+* Added `release [start, add, finish]`, `hotfix [start, add, finish]` and `sandbox [generate]` commands
+* Added simple error handling for some git commands for when they fail

data/lib/papa/cli/integration.rb

@@ -0,0 +1,13 @@
+module Papa
+  class Integration < Thor
+    desc 'start', 'Start an integration branch'
+    option :base_branch, aliases: '-b', required: true
+    def start
+      base_branch = options[:base_branch]
+      
+      require 'papa/common/start'
+      require 'papa/integration/start'
+      Integration::Start.new(base_branch: base_branch).run
+    end
+  end
+end

data/lib/papa/cli.rb

@@ -1,7 +1,8 @@
 require 'papa/common'
-require 'papa/release'
-require 'papa/hotfix'
-require 'papa/sandbox'
+require 'papa/cli/release'
+require 'papa/cli/hotfix'
+require 'papa/cli/integration'
+require 'papa/cli/sandbox'
 
 module Papa
   class CLI < Thor
@@ -11,6 +12,22 @@ module Papa
     desc 'hotfix [COMMAND]', 'Perform actions on hotfix branches'
     subcommand 'hotfix', Hotfix
 
+    desc 'integration [COMMAND]', 'Perform actions on integration branches'
+    subcommand 'integration', Integration
+
+    desc 'deploy', 'Deploy a branch with larga'
+    option :branch, aliases: '-b', required: true
+    option :hostname, aliases: '-h'
+    def deploy
+      require 'papa/deploy'
+      require 'papa/larga'
+
+      branch = options[:branch]
+      hostname = options[:hostname]
+
+      Deploy.new(branch: branch, hostname: hostname).run
+    end
+
     desc 'sandbox [COMMAND]', 'Test out papa in a sandboxed git environment'
     subcommand 'sandbox', Sandbox
   end

data/lib/papa/command.rb

@@ -2,15 +2,21 @@ module Papa
   class Command
     attr_accessor :command, :output, :exit_status
 
-    def initialize(command)
+    def initialize(command, options = {})
       @command = command
       @output = nil
       @exit_status = nil
+      @output_redirect =
+        if options[:silent]
+          Output::REDIRECT_TO_NULL
+        else
+          ''
+        end
     end
 
     def run
       return if @command.nil?
-      output = `#{@command} #{Output::REDIRECT_TO_NULL}`
+      output = `#{@command} #{@output_redirect}`
       exit_status = $?.exitstatus
       @output = output
       @exit_status = exit_status
@@ -22,11 +28,11 @@ module Papa
     end
 
     def cleanup
-      Output.stderr 'Cleaning up...'
+      # Override me
     end
 
     def success?
-      @exit_status == 0
+      !failed?
     end
 
     def failed?

data/lib/papa/common/add.rb

@@ -11,6 +11,7 @@ module Papa
         queue.add Git.fetch(remote: 'origin')
         queue.add Git.checkout(branch_name: @build_branch)
         queue.add Git.checkout(branch_name: branch)
+        queue.add Git.hard_reset(remote: 'origin', branch_name: branch)
         queue.add Git.rebase(base_branch_name: @build_branch)
         queue.add Git.force_push(remote: 'origin', branch_name: branch)
         queue.add Git.checkout(branch_name: @build_branch)

data/lib/papa/deploy.rb

@@ -0,0 +1,48 @@
+module Papa
+  class Deploy
+    def initialize(options = {})
+      @options = options
+      build_options
+    end
+
+    def run
+      queue = CommandQueue.new
+      queue.add Larga.type
+      queue.add Larga.deploy(@options)
+      if queue.run
+        success_message
+      else
+        failure_message
+        exit 1
+      end
+    end
+
+    private
+
+    def success_message
+      Output.stdout 'Successfully deployed larga instance.'
+    end
+
+    def failure_message
+      # TODO
+    end
+
+    def build_options
+      return if !branch_is_release_or_hotfix?
+      @options[:lifespan] = Larga::RELEASE_OR_HOTFIX_LIFESPAN
+      @options[:protection] = Larga::RELEASE_OR_HOTFIX_PROTECTION
+    end
+
+    def branch_is_release_or_hotfix?
+      branch_is_release? || branch_is_hotfix?
+    end
+
+    def branch_is_release?
+      @options[:branch].include? 'release'
+    end
+
+    def branch_is_hotfix?
+      @options[:branch].include? 'hotfix'
+    end
+  end
+end

data/lib/papa/git/fetch.rb

@@ -0,0 +1,13 @@
+module Papa
+  class Git::Fetch < Command
+    def initialize(remote)
+      command = "git fetch #{remote}"
+      super(command)
+    end
+
+    def failure_message
+      super
+      Output.stderr 'ERROR: Make sure origin exists and you have a working Internet connection'
+    end
+  end
+end

data/lib/papa/git.rb

@@ -5,11 +5,14 @@ module Papa
     end
 
     def self.fetch(remote:)
-      Command.new "git fetch #{remote}"
+      require 'papa/git/fetch'
+
+      Git::Fetch.new(remote)
     end
 
     def self.checkout(branch_name:)
       require 'papa/git/checkout'
+
       Git::Checkout.new(branch_name)
     end
 
@@ -23,6 +26,7 @@ module Papa
 
     def self.merge(branch_name:)
       require 'papa/git/merge'
+
       Git::Merge.new(branch_name)
     end
 
@@ -44,6 +48,7 @@ module Papa
 
     def self.rebase(base_branch_name:)
       require 'papa/git/rebase'
+
       Git::Rebase.new(base_branch_name)
     end
 
@@ -58,5 +63,9 @@ module Papa
     def self.push_tag(remote:, tag_name:)
       push(remote: remote, branch_name: tag_name)
     end
+
+    def self.hard_reset(remote:, branch_name:)
+      Command.new "git reset --hard #{remote}/#{branch_name}"
+    end
   end
 end

data/lib/papa/integration/start.rb

@@ -0,0 +1,17 @@
+require 'date'
+
+module Papa
+  class Integration::Start < Common::Start
+    def initialize(base_branch:)
+      @build_type = 'integration'
+      @base_branch = base_branch
+      @build_branch = generate_integration_branch_name
+    end
+
+    private
+
+    def generate_integration_branch_name
+      "integration/#{DateTime.now.strftime('%y.%m.%d.%H.%M').gsub('.0', '.')}"
+    end
+  end
+end

data/lib/papa/larga/deploy.rb

@@ -0,0 +1,36 @@
+module Papa
+  class Larga::Deploy < Command
+    def initialize(branch, lifespan, protection, hostname)
+      @branch = branch
+      @lifespan = lifespan
+      @protection = protection
+      @hostname = hostname
+
+      command = "larga #{build_options.join(' ')}"
+      super(command, silent: false)
+    end
+
+    def failed?
+      @output.include? 'Cowardly refusing'
+    end
+
+    def failure_message
+      super
+      Output.stderr 'ERROR: Ensure that the branch exists before trying again'
+    end
+
+    private
+    
+    def build_options()
+      options = []
+      options << '-action deploy'
+      options << "-branch #{@branch}"
+      options << "-lifespan #{@lifespan}"
+      options << "-protection #{@protection}"
+      if @hostname
+        options << "-hostname #{@hostname}"
+      end
+      options
+    end
+  end
+end

data/lib/papa/larga/type.rb

@@ -0,0 +1,12 @@
+module Papa
+  class Larga::Type < Command
+    def initialize
+      super('type larga')
+    end
+
+    def failure_message
+      super
+      Output.stderr 'Larga is not installed in this system'
+    end
+  end
+end

data/lib/papa/larga.rb

@@ -0,0 +1,18 @@
+module Papa
+  class Larga
+    RELEASE_OR_HOTFIX_LIFESPAN = '3d'
+    DEFAULT_LIFESPAN = '4h'
+    RELEASE_OR_HOTFIX_PROTECTION = 'off'
+    DEFAULT_PROTECTION = 'on'
+
+    def self.type
+      Larga::Type.new
+    end
+
+    def self.deploy(branch:, lifespan: DEFAULT_LIFESPAN, protection: DEFAULT_PROTECTION, hostname: nil)
+      require 'papa/larga/deploy'
+
+      Larga::Deploy.new(branch, lifespan, protection, hostname)
+    end
+  end
+end

data/lib/papa/sandbox/generate.rb

@@ -99,7 +99,7 @@ module Papa
     end
 
     def clone_remote_repository
-      Command.new("git clone #{@remote_repository_directory} #{@local_repository_directory}").run
+      Command.new("git clone #{@remote_repository_directory} #{@local_repository_directory}", silent: true).run
       Dir.chdir @local_repository_directory
     end
 

data/lib/papa/version.rb

@@ -1,3 +1,3 @@
 module Papa
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: papa
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - boggs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -85,27 +85,34 @@ files:
 - exe/papa
 - lib/papa.rb
 - lib/papa/cli.rb
+- lib/papa/cli/hotfix.rb
+- lib/papa/cli/integration.rb
+- lib/papa/cli/release.rb
+- lib/papa/cli/sandbox.rb
 - lib/papa/command.rb
 - lib/papa/command_queue.rb
 - lib/papa/common.rb
 - lib/papa/common/add.rb
 - lib/papa/common/finish.rb
 - lib/papa/common/start.rb
+- lib/papa/deploy.rb
 - lib/papa/git.rb
 - lib/papa/git/checkout.rb
+- lib/papa/git/fetch.rb
 - lib/papa/git/merge.rb
 - lib/papa/git/rebase.rb
-- lib/papa/hotfix.rb
 - lib/papa/hotfix/add.rb
 - lib/papa/hotfix/finish.rb
 - lib/papa/hotfix/start.rb
+- lib/papa/integration/start.rb
+- lib/papa/larga.rb
+- lib/papa/larga/deploy.rb
+- lib/papa/larga/type.rb
 - lib/papa/output.rb
-- lib/papa/release.rb
 - lib/papa/release/add.rb
 - lib/papa/release/finish.rb
 - lib/papa/release/patch.rb
 - lib/papa/release/start.rb
-- lib/papa/sandbox.rb
 - lib/papa/sandbox/branches/bugfix/4-fix-charmeleon-spelling/Gemfile
 - lib/papa/sandbox/branches/bugfix/5-fix-gem-source/Gemfile
 - lib/papa/sandbox/branches/feature/1-add-butterfree-gem/Gemfile