papa 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e79d7aa5abd7759a7acee2ac1538c6f4b3bc69e
-  data.tar.gz: 7eb13ccb695d9c423d1b3f60dd552184ef86c705
+  metadata.gz: e87718a595e00d18101632e567e76800eb8a4c18
+  data.tar.gz: 710dd0ab237970178c13f774b14d049d20475fb3
 SHA512:
-  metadata.gz: 807475a93bd68e8e520a7f069d38e1dee3c8e6491f81c21835140fa50af63e7f174994b69b5b2b2e82d6aeb7a5aa226063508ebbfe3f09fcc2911c0868879520
-  data.tar.gz: fd5289d8f9149e28666954a68def6ac64c9f1af26f5dfcdb3d1719a81244be2c2007e6720a5e046f18d3437e867ead2c6be84cea66d4079f570b1da898d474fc
+  metadata.gz: 0d6d937ed501f316b1203527f8ae2a6d6a104a88041fd37336978bd3b61b147b709faa9e3bec5e039d93060eaa78037151887c4750aa77503cc8a66a6dc04f77
+  data.tar.gz: 7c47861b1d7a9cafd95efcb488a43b6beb1dc3affe89850f0011d4bf9078f612300d2621c045b97640a1c97df21368ed96d21a6b5df6f9316286243807dcd52a

data/.gitignore

@@ -10,3 +10,4 @@
 
 # rspec failure tracking
 .rspec_status
+*.gem

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.4.0
+* Classes have been housed into their own modules
+* Minor change to how commands are run, but shouldn't affect functionality
+* Code cleanup
+
 ## 0.3.0
 * Used open3 for easier output and exit status handling
 * Added more descriptive output messages

data/README.md

@@ -1,4 +1,4 @@
-# Papa [![Gem Version](https://badge.fury.io/rb/papa.svg)](https://badge.fury.io/rb/papa) [![Build Status](https://travis-ci.org/b-ggs/papa.svg?branch=master)](https://travis-ci.org/b-ggs/papa) [![Maintainability](https://api.codeclimate.com/v1/badges/cec506e3421dc3e08eeb/maintainability)](https://codeclimate.com/github/b-ggs/papa/maintainability)
+# Papa [![Gem Version](https://badge.fury.io/rb/papa.svg)](https://badge.fury.io/rb/papa) [![Build Status](https://travis-ci.org/b-ggs/papa.svg?branch=master)](https://travis-ci.org/b-ggs/papa)
 
 Helper tool for inDinero's git workflow. Ako ang papa mo.
 
@@ -150,6 +150,26 @@ $ papa integration start -b develop
 
 ### `papa deploy`
 
+#### Deploying a new environment
+
+This will create a new environment using `larga`.
+
+```
+$ papa deploy -b, --branch=BRANCH [-h, --hostname=HOSTNAME]
+```
+
+##### Sample Usage:
+
+```
+$ papa deploy -b feature/dunder-mifflin-this-is-pam
+```
+
+If you want to specify a hostname for this environment:
+
+```
+$ papa deploy -b feature/we-were-on-a-break -h ross-and-rachel
+```
+
 ### `papa sandbox`
 
 #### Generating a new sandbox
@@ -158,4 +178,4 @@ This will generate a git repository that you can use to test out `papa`.
 
 ```
 $ papa sandbox generate
-```
+```

data/exe/papa

@@ -3,4 +3,4 @@
 
 require 'papa'
 
-Papa::CLI.start ARGV
+Papa::CLI::Main.start ARGV

data/lib/papa/cli/hotfix.rb

@@ -1,37 +1,36 @@
 module Papa
-  class Hotfix < Thor
-    desc 'start', 'Start a new hotfix branch'
-    option :version, aliases: '-v', required: true
-    def start
-      version = options[:version]
+  module CLI
+    class Hotfix < Thor
+      desc 'start', 'Start a new hotfix branch'
+      option :version, aliases: '-v', required: true
+      def start
+        version = options[:version]
 
-      require 'papa/common/start'
-      require 'papa/hotfix/start'
-      Hotfix::Start.new(version: version).run
-    end
+        require 'papa/task/hotfix/start'
+        Task::Hotfix::Start.new(version: version).run
+      end
 
-    desc 'add', 'Add bugfix branches to a hotfix branch'
-    option :version, aliases: '-v', required: true
-    option :bugfix_branches, aliases: '-b', type: :array
-    def add
-      version = options[:version]
-      bugfix_branches = options[:bugfix_branches] || []
+      desc 'add', 'Add bugfix branches to a hotfix branch'
+      option :version, aliases: '-v', required: true
+      option :bugfix_branches, aliases: '-b', type: :array
+      def add
+        version = options[:version]
+        bugfix_branches = options[:bugfix_branches] || []
 
-      require 'papa/common/add'
-      require 'papa/hotfix/add'
-      Hotfix::Add.new(version: version, bugfix_branches: bugfix_branches).run
-    end
+        require 'papa/task/hotfix/add'
+        Task::Hotfix::Add.new(version: version, bugfix_branches: bugfix_branches).run
+      end
 
-    desc 'finish', 'Merge the hotfix branch to the base branches'
-    option :version, aliases: '-v', required: true
-    option :additional_branches, aliases: '-b', type: :array
-    def finish
-      version = options[:version]
-      additional_branches = options[:additional_branches]
+      desc 'finish', 'Merge the hotfix branch to the base branches'
+      option :version, aliases: '-v', required: true
+      option :additional_branches, aliases: '-b', type: :array
+      def finish
+        version = options[:version]
+        additional_branches = options[:additional_branches]
 
-      require 'papa/common/finish'
-      require 'papa/hotfix/finish'
-      Hotfix::Finish.new(version: version, additional_branches: additional_branches).run
+        require 'papa/task/hotfix/finish'
+        Task::Hotfix::Finish.new(version: version, additional_branches: additional_branches).run
+      end
     end
   end
 end

data/lib/papa/cli/integration.rb

@@ -1,13 +1,14 @@
 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
+  module CLI
+    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/task/integration/start'
+        Task::Integration::Start.new(base_branch: base_branch).run
+      end
     end
   end
 end

data/lib/papa/cli/main.rb

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

data/lib/papa/cli/release.rb

@@ -1,47 +1,34 @@
 module Papa
-  class Release < Thor
-    desc 'start', 'Start a new release branch'
-    option :version, aliases: '-v', required: true
-    def start
-      version = options[:version]
+  module CLI
+    class Release < Thor
+      desc 'start', 'Start a new release branch'
+      option :version, aliases: '-v', required: true
+      def start
+        version = options[:version]
 
-      require 'papa/common/start'
-      require 'papa/release/start'
-      Release::Start.new(version: version).run
-    end
+        require 'papa/task/release/start'
+        Task::Release::Start.new(version: version).run
+      end
 
-    desc 'add', 'Add feature branches to a release branch'
-    option :version, aliases: '-v', required: true
-    option :feature_branches, aliases: '-b', type: :array
-    def add
-      version = options[:version]
-      feature_branches = options[:feature_branches] || []
+      desc 'add', 'Add feature branches to a release branch'
+      option :version, aliases: '-v', required: true
+      option :feature_branches, aliases: '-b', type: :array
+      def add
+        version = options[:version]
+        feature_branches = options[:feature_branches] || []
 
-      require 'papa/common/add'
-      require 'papa/release/add'
-      Release::Add.new(version: version, feature_branches: feature_branches).run
-    end
+        require 'papa/task/release/add'
+        Task::Release::Add.new(version: version, feature_branches: feature_branches).run
+      end
 
-    desc 'finish', 'Merge the release branch to master and develop'
-    option :version, aliases: '-v', required: true
-    def finish
-      version = options[:version]
+      desc 'finish', 'Merge the release branch to master and develop'
+      option :version, aliases: '-v', required: true
+      def finish
+        version = options[:version]
 
-      require 'papa/common/finish'
-      require 'papa/release/finish'
-      Release::Finish.new(version: version).run
+        require 'papa/task/release/finish'
+        Task::Release::Finish.new(version: version).run
+      end
     end
-
-    # desc 'patch', 'Add a patch to release branch'
-    # option :version, aliases: '-v', required: true
-    # option :patch_branch, aliases: '-b', required: true
-    # def patch 
-    #   version = options[:version]
-    #   patch_branch = options[:patch_branch]
-    #
-    #   require 'papa/common/add'
-    #   require 'papa/release/patch'
-    #   Release::Patch.new(version: version, patch_branch: patch_branch).run
-    # end
   end
 end

data/lib/papa/cli/sandbox.rb

@@ -1,17 +1,19 @@
 module Papa
-  class Sandbox < Thor
-    desc 'generate', 'Generate a sandbox environment'
-    option :override_origin, aliases: '-o'
-    option :override_path_prefix, aliases: '-p'
-    def generate
-      require 'papa/sandbox/generate'
-      Sandbox::Generate.new(options).run
-    end
+  module CLI
+    class Sandbox < Thor
+      desc 'generate', 'Generate a sandbox environment'
+      option :override_origin, aliases: '-o'
+      option :override_path_prefix, aliases: '-p'
+      def generate
+        require 'papa/task/sandbox/generate'
+        Task::Sandbox::Generate.new(options).run
+      end
 
-    desc 'clean', 'Clean up sandbox directories in /tmp'
-    def clean
-      require 'papa/sandbox/clean'
-      Sandbox::Clean.new.run
+      desc 'clean', 'Clean up sandbox directories in /tmp'
+      def clean
+        require 'papa/task/sandbox/clean'
+        Task::Sandbox::Clean.new.run
+      end
     end
   end
 end

data/lib/papa/command/base.rb

@@ -0,0 +1,48 @@
+require 'open3'
+require 'papa/helper/output'
+
+module Papa
+  module Command
+    class Base
+      attr_accessor :command, :stdout, :stderr, :exit_status, :silent
+
+      def initialize(command, options = {})
+        @command = command
+        @silent = options.has_key?(:silent) ? options[:silent] : false
+      end
+
+      def run
+        return if command.nil?
+        Helper::Output.stdout "Running #{command.bold}..." unless silent
+        @stdout, @stderr, status = Open3.capture3(command)
+        @exit_status = status.exitstatus
+        self
+      end
+
+      def failure_message
+        message = "Error while running #{command.bold}"
+        Helper::Output.error message
+        Helper::Output.error stderr
+        message
+      end
+
+      def cleanup
+        # Override me
+      end
+
+      def success?
+        !failed?
+      end
+
+      def failed?
+        exit_status != 0
+      end
+
+      private
+
+      def current_branch
+        @current_branch ||= `git symbolic-ref --short HEAD`.chomp
+      end
+    end
+  end
+end

data/lib/papa/command/git/branch.rb

@@ -0,0 +1,15 @@
+require 'papa/command/base'
+
+module Papa
+  module Command
+    module Git
+      class Branch < Command::Base
+        def initialize(branch_name)
+          @branch_name = branch_name
+          command = "git branch #{branch_name}"
+          super(command)
+        end
+      end
+    end
+  end
+end

data/lib/papa/command/git/branch_delete.rb

@@ -0,0 +1,14 @@
+require 'papa/command/base'
+
+module Papa
+  module Command
+    module Git
+      class BranchDelete < Command::Base
+        def initialize(branch_name)
+          command = "git branch -D #{branch_name}"
+          super(command)
+        end
+      end
+    end
+  end
+end

data/lib/papa/command/git/checkout.rb

@@ -0,0 +1,22 @@
+require 'papa/command/base'
+
+module Papa
+  module Command
+    module Git
+      class Checkout < Command::Base
+        def initialize(branch_name)
+          @branch_name = branch_name
+          command = "git checkout #{@branch_name}"
+          super(command)
+        end
+
+        def failure_message
+          super
+          message = "Failed to checkout #{@branch_name.bold}. Check whether this branch exists."
+          Helper::Output.error message
+          message
+        end
+      end
+    end
+  end
+end

data/lib/papa/command/git/fetch.rb

@@ -0,0 +1,22 @@
+require 'papa/command/base'
+
+module Papa
+  module Command
+    module Git
+      class Fetch < Command::Base
+        def initialize(remote)
+          @remote = remote
+          command = "git fetch #{remote}"
+          super(command)
+        end
+
+        def failure_message
+          super
+          message = "Failed to fetch from #{@remote}. Please check your internet connection and try again."
+          Helper::Output.stderr message
+          message
+        end
+      end
+    end
+  end
+end

data/lib/papa/command/git/merge.rb

@@ -0,0 +1,33 @@
+require 'papa/command/base'
+
+module Papa
+  module Command
+    module Git
+      class Merge < Command::Base
+        def initialize(branch_name)
+          @branch_name = branch_name
+          command = "git merge #{@branch_name} --no-ff"
+          super(command)
+        end
+
+        def run
+          current_branch # Store current branch before executing command
+          super
+        end
+
+        def cleanup
+          super
+          Command::Git::MergeAbort.new.run
+          Command::Git::Checkout.new(current_branch).run
+        end
+
+        def failure_message
+          super
+          message = "Failed to merge #{@branch_name} into #{current_branch}. Merge conflict?"
+          Helper::Output.error message
+          message
+        end
+      end
+    end
+  end
+end

data/lib/papa/command/git/merge_abort.rb

@@ -0,0 +1,14 @@
+require 'papa/command/base'
+
+module Papa
+  module Command
+    module Git
+      class MergeAbort < Command::Base
+        def initialize
+          command = 'git merge --abort'
+          super(command)
+        end
+      end
+    end
+  end
+end

data/lib/papa/command/git/pull.rb

@@ -0,0 +1,14 @@
+require 'papa/command/base'
+
+module Papa
+  module Command
+    module Git
+      class Pull < Command::Base
+        def initialize(remote, branch_name)
+          command = "git pull #{remote} #{branch_name}"
+          super(command)
+        end
+      end
+    end
+  end
+end

data/lib/papa/command/git/push.rb

@@ -0,0 +1,14 @@
+require 'papa/command/base'
+
+module Papa
+  module Command
+    module Git
+      class Push < Command::Base
+        def initialize(remote, branch_name)
+          command = "git push #{remote} #{branch_name}"
+          super(command)
+        end
+      end
+    end
+  end
+end

data/lib/papa/command/git/push_force.rb

@@ -0,0 +1,14 @@
+require 'papa/command/base'
+
+module Papa
+  module Command
+    module Git
+      class PushForce < Command::Base
+        def initialize(remote, branch_name)
+          command = "git push #{remote} #{branch_name} --force-with-lease"
+          super(command)
+        end
+      end
+    end
+  end
+end

data/lib/papa/command/git/rebase.rb

@@ -0,0 +1,39 @@
+require 'papa/command/base'
+require 'papa/command/git/rebase_abort'
+require 'papa/command/git/checkout'
+
+module Papa
+  module Command
+    module Git
+      class Rebase < Command::Base
+        def initialize(base_branch_name)
+          @base_branch_name = base_branch_name
+          command = "git rebase #{@base_branch_name}"
+          super(command)
+        end
+
+        def run
+          current_branch # Store current branch before executing command
+          super
+        end
+
+        def cleanup
+          super
+          queue = [
+            Git::RebaseAbort.new,
+            Git::Checkout.new(current_branch)
+          ]
+          runner = Runner.new(queue)
+          runner.run
+        end
+
+        def failure_message
+          super
+          message = "Failed to rebase #{current_branch} from #{@base_branch_name}. Merge conflict?"
+          Helper::Output.error message
+          message
+        end
+      end
+    end
+  end
+end

data/lib/papa/command/git/rebase_abort.rb

@@ -0,0 +1,14 @@
+require 'papa/command/base'
+
+module Papa
+  module Command
+    module Git
+      class RebaseAbort < Command::Base
+        def initialize
+          command = 'git rebase --abort'
+          super(command)
+        end
+      end
+    end
+  end
+end

data/lib/papa/command/git/reset_hard.rb

@@ -0,0 +1,14 @@
+require 'papa/command/base'
+
+module Papa
+  module Command
+    module Git
+      class ResetHard < Command::Base
+        def initialize(remote, branch_name)
+          command = "git reset --hard #{remote}/#{branch_name}"
+          super(command)
+        end
+      end
+    end
+  end
+end

data/lib/papa/command/git/tag.rb

@@ -0,0 +1,14 @@
+require 'papa/command/base'
+
+module Papa
+  module Command
+    module Git
+      class Tag < Command::Base
+        def initialize(tag_name)
+          command = "git tag #{tag_name}"
+          super(command)
+        end
+      end
+    end
+  end
+end

data/lib/papa/command/git/tag_push.rb

@@ -0,0 +1,14 @@
+require 'papa/command/base'
+
+module Papa
+  module Command
+    module Git
+      class TagPush < Command::Base
+        def initialize(remote, tag_name)
+          command = "git push #{remote} #{tag_name}"
+          super(command)
+        end
+      end
+    end
+  end
+end