t1k 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45cd40e21fada7acc6cfd3abec506f886ac990d1
-  data.tar.gz: 1d1c2be3e4c91e2258cb07b7b686ae64b01ad3e7
+  metadata.gz: c00fb15bd08b42750f3e4e1d68d2880ba7cee574
+  data.tar.gz: 9607d5c8562fad145232fd20bb49b4552e737bf5
 SHA512:
-  metadata.gz: d69e38d46b4550587bcaf2c34bf68111630cc6f6e65e77788e9391d80c63d468d5518af86eeb09a59df80ae8e0ee064cebe9032fda025798a2ee42bffe8cccae
-  data.tar.gz: 4dfeba2189c6ce63dfc2d8895e6378df92f844ac2934287ce0801f9cf8f6e3b6fd65ff7794fe3a5a4c1eb2c5be9c780b543d3f463624f2d8082d4bc729126530
+  metadata.gz: de69ffb11d0ecfc37b6b7be7a7978bf932bd3e67c32fc56f9ea77b61dabca50fc3ea8c626cda77b31a0b227f35ec9f04ddb5572b74651c9c0edea0a58d4d3e9a
+  data.tar.gz: ef59f6ef62749d076a5d1271f41f4307fd3b18466612a7b2efe56f2f196e360315d2748d17adcfc6a27559b21e660c0c38daabd47fafbba342234e9184913d7c

data/lib/t1k/command.rb

@@ -4,6 +4,7 @@ require 't1k/commands/hack'
 require 't1k/commands/commit'
 require 't1k/commands/sink'
 require 't1k/commands/ship'
+require 't1k/commands/pull_request'
 
 module T1k
   class CLI < Clive
@@ -70,5 +71,13 @@ module T1k
     opt :v, :version, 'Display the current version' do
       puts T1k::VERSION
     end
+
+    desc 'Send your code to remote branch. Not to master'
+    command :pr do
+
+      action do
+        Commands::PullRequest.run
+      end
+    end
   end
 end

data/lib/t1k/commands/branch.rb

@@ -0,0 +1,11 @@
+module T1k
+  module Commands
+    class Branch
+      def self.actual_branch
+        branch = `git branch | grep '*' | awk '{print $2}'`
+
+        branch
+      end
+    end
+  end
+end

data/lib/t1k/commands/commit.rb

@@ -7,13 +7,9 @@ module T1k
         text_close = ''
 
         raise "Message can't be blank. Use --no-message to ignore this rule." if message.empty? && !no_message
-        branch = `git branch | grep '*' | awk '{print $2}'`
+        branch = T1k::Commands::Branch.actual_branch
 
-        text_close = close ? 'close ' : 'ref'
-
-        if close
-          text_close = 'close '
-        end
+        text_close = close ? 'close' : 'ref'
 
         text_add = add ? 'a' : ''
 

data/lib/t1k/commands/pull_request.rb

@@ -0,0 +1,23 @@
+module T1k
+  module Commands
+    class PullRequest
+
+      def self.run
+        T1k::Commands::Sink.run
+
+        branch = T1k::Commands::Branch.actual_branch
+        pull   = `git push origin #{branch.strip}`
+        self.open_browser pull
+      end
+
+      def self.open_browser pull
+        return 1 if pull.nil?
+        match = pull.match( /(https:\/\/[a-zA-Z].*=1)/)
+        if match
+          uri = match[0]
+          system "open #{uri}"
+        end
+      end
+    end
+  end
+end

data/lib/t1k/commands/ship.rb

@@ -3,13 +3,40 @@ module T1k
     class Ship
 
       def self.run
-        branch = `git branch | grep '*' | awk '{print $2}'`
-        system "git checkout master"
-        system "git pull --rebase"
-        system "git merge #{branch.strip}"
-        system "git commit -v"
-        system "git push origin master"
+        T1k.setup_credentials
+
+        default_remote_branch = T1k::Repository.default_remote_branch
+        branch                = T1k::Commands::Branch.actual_branch.strip
+
+        if default_remote_branch == :master
+          commands_if_master(branch)
+        elsif default_remote_branch == :branch
+          commands_if_branch(branch)
+        else
+          puts "Invalid default_remote_branch"
+        end
+      end
+
+      def self.commands_if_master(branch)
+        [ "git checkout master",
+          "git pull --rebase",
+          "git merge #{branch}",
+          "git commit -v",
+          "git push origin master"
+        ].each do |cmd|
+          system cmd
+        end
+      end
+
+      def self.commands_if_branch(branch)
+        [ "git checkout #{branch}",
+          "git pull --rebase",
+          "git commit -v",
+          "git push origin #{branch}"
+        ].each do |cmd|
+          system cmd
+        end
       end
     end
   end
-end
+end

data/lib/t1k/commands/sink.rb

@@ -2,12 +2,37 @@ module T1k
   module Commands
     class Sink
       def self.run
-        branch = `git branch | grep '*' | awk '{print $2}'`
-        system "git checkout master"
-        system "git pull --rebase origin master"
-        system "git checkout #{branch.strip}"
-        system "git rebase master #{branch.strip}"
+        T1k.setup_credentials
+
+        default_remote_branch = T1k::Repository.default_remote_branch
+        branch                = T1k::Commands::Branch.actual_branch
+
+        if default_remote_branch == :master
+          commands_if_master(branch)
+        elsif default_remote_branch == :branch
+          commands_if_branch(branch)
+        else
+          puts "Invalid default_remote_branch"
+        end
+      end
+
+      def self.commands_if_master(branch)
+        [ "git checkout master",
+          "git pull --rebase origin master",
+          "git checkout #{branch.strip}",
+          "git rebase master #{branch.strip}"
+        ].each do |cmd|
+          system cmd
+        end
+      end
+
+      def self.commands_if_branch(branch)
+        [ "git checkout #{branch}",
+          "git pull --rebase",
+        ].each do |cmd|
+          system cmd
+        end
       end
     end
   end
-end
+end

data/lib/t1k/commands/validate.rb

@@ -5,9 +5,9 @@ module T1k
   module Commands
     class Validate
 
-      cattr_accessor :messages
+      mattr_accessor :messages
       @@messages = []
-      @@errors = []
+      @@errors   = []
 
       def self.run
         T1k.setup_credentials

data/lib/t1k/repository.rb

@@ -1,21 +1,27 @@
 module T1k
   class Repository
+    PERMITTEDS_BRANCH_NAME = [
+        :branch, :master
+    ]
 
-    cattr_accessor :adapter
-
+    mattr_accessor :adapter
     @@adapter = nil
 
+    cattr_accessor :default_remote_branch
+    @@default_remote_branch = ""
+
     def self.setup &block
       self.adapter.setup(&block) if block_given?
     end
 
     def self.adapter=(adapter_name)
-      raise "Invalid adapter name. Adapter name must be a Symbol." unless adapter_name.class.eql?(Symbol)
+      raise "Invalid adapter name. Adapter name must either :master or :branch." unless adapter_name.class.eql?(Symbol)
       @@adapter = "T1k::Repositories::#{adapter_name.to_s.classify}".constantize
     end
 
     def self.default_repository
       @@adapter
     end
+
   end
 end

data/lib/t1k/version.rb

@@ -1,3 +1,3 @@
 module T1k
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/lib/t1k.rb

@@ -10,6 +10,7 @@ require 't1k/version'
 require 't1k/constants'
 require 't1k/command'
 
+require 't1k/commands/branch'
 
 require_relative '../spec/support/kernel' if ENV["DEBUG"]
 

data/resources/T1000

@@ -19,6 +19,11 @@ T1k.setup do |config|
   #    c.password    = "#{ENV['BITBUCKET_PWD']}"
   #  end
 
+  # config.repository.default_remote_branch = :master
+  # or
+  # config.repository.default_remote_branch = :branch
+  # |-> this option disables direct merge on origin master
+
   # Setup Trello board credentials
   #
   # Trello APP_DEVELOPER_KEY: https://trello.com/app-key

data/spec/spec_helper.rb

@@ -1,2 +1,8 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter "/spec/"
+end
+
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 't1k'
+require 'support/kernel.rb'

data/spec/support/kernel.rb

@@ -2,6 +2,14 @@ require 'clive'
 
 module Kernel
   def system(cmd)
-    puts "#{cmd} was called".green.bold
+    puts "#{cmd}".green.bold
+  end
+
+  def `(cmd)
+    if cmd == "git branch | grep '*' | awk '{print $2}'"
+      'branch_name'
+    else
+      puts "#{cmd}".green.bold
+    end
   end
 end

data/spec/t1k/commands/branch_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe T1k::Commands::Branch do
+  it 'does have the actual branch' do
+    expect(T1k::Commands::Branch.actual_branch).to eq("branch_name")
+  end
+end

data/spec/t1k/commands/commit_spec.rb

@@ -14,6 +14,14 @@ describe T1k::Commands::Commit do
       expect { T1k::Commands::Commit.run( message, close, add, no_message) }.to raise_error("Message can't be blank. Use --no-message to ignore this rule.")
     end
 
+
+    it "does not raise an exception" do
+      message    = ""
+      no_message =  true
+
+      expect { T1k::Commands::Commit.run( message, close, add, no_message) }.to_not raise_error("Message can't be blank. Use --no-message to ignore this rule.")
+    end
+
     it "it have to skip circle ci when is not a close commit" do
       close = false
       expect_any_instance_of(Kernel).to receive(:system).with("git commit -m '[ref#branch_name] teste'")
@@ -23,7 +31,7 @@ describe T1k::Commands::Commit do
 
     it "have to close the issue when close=true is passed" do
       close = true
-      expect_any_instance_of(Kernel).to receive(:system).with("git commit -m '[close #branch_name] teste'")
+      expect_any_instance_of(Kernel).to receive(:system).with("git commit -m '[close#branch_name] teste'")
 
       T1k::Commands::Commit.run( msg, close, add, no_message)
     end

data/spec/t1k/commands/hack_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe T1k::Commands::Hack do
+
+  describe '#self.run' do
+
+  end
+
+end

data/spec/t1k/commands/pull_request_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe T1k::Commands::PullRequest do
+  subject { T1k::Commands::PullRequest }
+  context '#run' do
+    it 'have to sink' do
+      expect(T1k::Commands::Sink).to receive(:run)
+
+      subject.run
+    end
+
+    it 'have to push code to new branch' do
+        [
+          "git checkout master",
+          "git pull --rebase origin master",
+          "git checkout branch_name",
+          "git rebase master branch_name",
+          "git push origin branch_name"
+        ].each do |cmd|
+          allow_any_instance_of(Kernel).to receive(:system).with( cmd )
+         end
+
+      subject.run
+    end
+  end
+end

data/spec/t1k/commands/ship_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe T1k::Commands::Ship do
+  describe '#self.run' do
+
+    it "should checkout to master" do
+
+      [
+        "git checkout master",
+        "git pull --rebase",
+        "git merge branch_name",
+        "git commit -v",
+        "git push origin master"
+      ].each do |cmd|
+        allow_any_instance_of(Kernel).to receive(:system).with( cmd )
+      end
+
+      T1k::Commands::Ship.run
+    end
+  end
+end

data/spec/t1k/commands/validate_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+module T1k
+  module Repositories
+    class Repo
+    end
+  end
+end
+
+describe T1k::Commands::Validate do
+  context "repository" do
+    it 'does have return the default repository' do
+      expect(T1k::Repository).to receive(:default_repository)
+
+      T1k::Commands::Validate.default_repository
+    end
+
+    it 'does have valid keys' do
+      T1k::Repository.adapter = :repo
+      expect(T1k::Commands::Validate.default_repository).to receive(:valid_keys?)
+
+      T1k::Commands::Validate.valid_keys_on_repository?
+    end
+  end
+end

data/spec/t1k_spec.rb

@@ -1,11 +1,63 @@
 require 'spec_helper'
 
 describe T1k do
-  it 'has a version number' do
-    expect(T1k::VERSION).not_to be nil
+
+  context '' do
+
   end
 
-  it 'does something useful' do
-    expect(false).to eq(true)
+  context '#self.setup_credentials' do
+    context 'read a config file' do
+      context 'with valid data' do
+
+        before do
+          T1k.setup do |config|
+            config.repository.adapter = :bitbucket
+          end
+
+          subject.setup_credentials
+        end
+
+        context 'on repository' do
+          it 'sets default_repository' do
+            expect(T1k::Repository.default_repository).to_not be_nil
+          end
+
+          it 'default_repository should be Bitbucket' do
+            expect(T1k::Repository.default_repository).to eq(T1k::Repositories::Bitbucket)
+          end
+
+          it 'adapter should be Bitbucket' do
+            expect(T1k::Repository.adapter).to eq(T1k::Repositories::Bitbucket)
+          end
+        end
+
+        context 'on tracker' do
+          it 'adapter is trello' do
+            subject.setup_credentials
+            expect(T1k::Tracker.adapter).to eq(T1k::Trackers::Trello)
+          end
+        end
+      end
+    end
+
+    context 'with invalid data' do
+      it 'returns a error for repository' do
+        expect {
+          T1k.setup do |config|
+            config.repository.adapter = :invalid
+          end
+        }.to raise_error(NameError)
+      end
+
+
+      it 'returns a error for tracker' do
+        expect {
+          T1k.setup do |config|
+            config.tracker.adapter = :invalid
+          end
+        }.to raise_error(NameError)
+      end
+    end
   end
 end

data/t1k.gemspec

@@ -19,8 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = ["t1k"]
   spec.require_paths = ["lib", "resources"]
 
-  spec.add_development_dependency 'bundler', '~> 1.9'
-  spec.add_development_dependency 'rake'   , '~> 10.0'
+  spec.add_development_dependency 'bundler'   , '~> 1.9'
+  spec.add_development_dependency 'rake'      , '~> 10.0'
+  spec.add_development_dependency 'simplecov' , '~>0.11.2'
+  spec.add_development_dependency 'pry'
 
   spec.add_dependency 'ruby-trello'  , '~> 1.2.1'
   spec.add_dependency 'github_api'   , '~> 0.12'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t1k
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Rodrigo Maia
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,6 +40,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-trello
   requirement: !ruby/object:Gem::Requirement
@@ -131,9 +159,11 @@ files:
 - ./bin/t1k
 - ./lib/t1k.rb
 - ./lib/t1k/command.rb
+- ./lib/t1k/commands/branch.rb
 - ./lib/t1k/commands/commit.rb
 - ./lib/t1k/commands/hack.rb
 - ./lib/t1k/commands/init.rb
+- ./lib/t1k/commands/pull_request.rb
 - ./lib/t1k/commands/ship.rb
 - ./lib/t1k/commands/sink.rb
 - ./lib/t1k/commands/validate.rb
@@ -149,7 +179,12 @@ files:
 - ./resources/T1000
 - ./spec/spec_helper.rb
 - ./spec/support/kernel.rb
+- ./spec/t1k/commands/branch_spec.rb
 - ./spec/t1k/commands/commit_spec.rb
+- ./spec/t1k/commands/hack_spec.rb
+- ./spec/t1k/commands/pull_request_spec.rb
+- ./spec/t1k/commands/ship_spec.rb
+- ./spec/t1k/commands/validate_spec.rb
 - ./spec/t1k_spec.rb
 - ./t1k.gemspec
 - README.md