gitit 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe90ba6d576b4229458a0f87a846ffbd2f7b0778
-  data.tar.gz: 9fff1938db737966882eadd712aae732048daa6b
+  metadata.gz: af209587e77caca9136ae19f2d0efbf8ba3eb91b
+  data.tar.gz: 666be3564b3934764dc32bd234b3d5fb33826e89
 SHA512:
-  metadata.gz: fd65fab4db9ff67991a87e0e62fb77ddc0f62a455d99484776125d6b01967e6691f15c5c03432d9f56244ada4c4788294871afe3baea1da18937c19bdf464c9c
-  data.tar.gz: eb58091dbc95bcadfbf852eaa946a2b82567f4e9f87185ae423b2f551fc2230b2367a581ccf9606871f519789bef94b6ac17d510ea3e392f0d275888869489dc
+  metadata.gz: 6021bd64aad05f62f49cf37418428b40fc2a4bce8aac5d61530495be7258d98d27822ff9eda80f16752971206896e9508fcd447293a5ec899fef17901da8d5c9
+  data.tar.gz: 4f56f4a768aa3920f4ad1eaacb1170d823b595c0f25377d2fbc1523f47d5e5f1f4b69a5b19b17c4aa30fe18f80736d363b2169d1566dbd8c5b8777cec789e1a1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/gitit/command_branch.rb

@@ -0,0 +1,33 @@
+require "bundler/setup"
+require "gitit/command_executor"
+
+Bundler.require(:default)
+
+module Gitit
+
+  # ---------------------------------------------------------------------------
+  # ---------------------------------------------------------------------------
+  class Branch
+    include CommandExecutor
+
+    attr_reader :name;
+    
+    # -------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
+    def initialize(repo, name)
+      @repo = repo
+      @name = name
+    end
+
+    # -------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
+    def valid?
+      executeCommand("diff --cached --no-ext-diff --ignore-submodules --quiet --exit-code")
+      return true if $?.exitstatus == 1
+      return false
+    end
+    
+  end
+
+end
+

data/lib/gitit/command_branches.rb

@@ -0,0 +1,41 @@
+require "bundler/setup"
+require "gitit/command_executor"
+
+Bundler.require(:default)
+
+module Gitit
+
+  # ---------------------------------------------------------------------------
+  # ---------------------------------------------------------------------------
+  class Branches
+    include CommandExecutor
+    
+    # -------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
+    def initialize(repo)
+      @repo = repo
+    end
+
+    # -------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
+    def existsLocally?(name)
+      branches = executeCommand("branch --no-color | sed 's/^[* ] //'")
+      executeCommand("branch --no-color | sed 's/^[* ] //' | grep #{name}")
+      return true if $?.exitstatus == 0
+      return false
+    end
+    
+    # -------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
+    def existsRemotely?(name)
+      branches = executeCommand("branch -r --no-color | sed 's/^[* ] //'")
+      executeCommand("branch --no-color | sed 's/^[* ] //' | grep #{name}")
+      return true if $?.exitstatus == 0
+      return false
+    end
+    
+  end
+
+end
+
+

data/lib/gitit/git.rb

@@ -1,8 +1,11 @@
 require "bundler/setup"
 require "gitit"
 require "gitit/repo"
-require "gitit/command_config"
-require "gitit/command_status"
+Dir[File.dirname(__FILE__) + "/command_*.rb"].each do |file|
+  require file
+end
+#require "gitit/command_config"
+#require "gitit/command_status"
 
 Bundler.require(:default)
 
@@ -14,6 +17,7 @@ module Gitit
     attr_reader :repo;
     attr_reader :config;
     attr_reader :status;
+    attr_reader :branches;
 
     # -------------------------------------------------------------------------
     # -------------------------------------------------------------------------
@@ -21,6 +25,7 @@ module Gitit
       @repo = Repo.new(location)
       @config = Config.new(repo)
       @status = Status.new(repo)
+      @branches = Branches.new(repo)
     end
   end
 

data/lib/gitit/repo.rb

@@ -20,7 +20,7 @@ module Gitit
     # -------------------------------------------------------------------------
     # -------------------------------------------------------------------------
     def valid?
-      commandres = `(cd #{@location} && git status 2&>/dev/null)`
+      commandres = `(cd #{@location} && git rev-parse --git-dir >/dev/null 2>&1)`
       return true unless $?.exitstatus != 0 
       return false
     end

data/lib/tasks/version.rake

@@ -0,0 +1,138 @@
+require 'cli-colorize'
+
+def valid? version
+  pattern = /^\d+\.\d+\.\d+(\-(dev|beta|rc\d+))?$/
+  raise "Tried to set invalid version: #{version}".red unless version =~ pattern
+end
+
+def correct_version version
+  ver, flag = version.split '-'
+  v = ver.split '.'
+  (0..2).each do |n|
+    v[n] = v[n].to_i
+  end
+  [v.join('.'), flag].compact.join '-'
+end
+
+def read_version
+  begin 
+    File.read 'VERSION'
+  rescue
+    raise "VERSION file not found or unreadable.".red
+  end
+end
+
+def write_version version
+  valid? version
+  begin
+    File.open 'VERSION', 'w' do |file|
+      file.write correct_version(version)
+    end
+  rescue
+    raise "VERSION file not found or unwritable.".red
+  end
+end
+
+def reset current, which
+  version, flag = current.split '-'
+  v = version.split '.'
+  which.each do |part|
+    v[part] = 0
+  end
+  [v.join('.'), flag].compact.join '-'
+end
+
+def increment current, which
+  version, flag = current.split '-'
+  v = version.split '.'
+  v[which] = v[which].to_i + 1
+  [v.join('.'), flag].compact.join '-'
+end
+
+desc "Prints the current application version"
+version = read_version
+task :version do
+  puts <<HELP
+Available commands are:
+-----------------------
+rake version:write[version]   # set custom version in the x.x.x-? format
+rake version:patch            # increment the patch x.x.x+1 (keeps any flags on)
+rake version:minor            # increment minor and reset patch x.x+1.0 (keeps any flags on)
+rake version:major            # increment major and reset others x+1.0.0 (keeps any flags on)
+rake version:dev              # set the dev flag on x.x.x-dev
+rake version:beta             # set the beta flag on x.x.x-beta
+rake version:rc               # set or increment the rc flag x.x.x-rcX
+rake version:release          # removes any flags from the current version
+
+HELP
+  puts "Current version is: #{version.green}"
+end
+
+namespace :version do
+  
+  desc "Write version explicitly by specifying version number as a parameter"
+  task :write, [:version] do |task, args|
+    write_version args[:version].strip
+    puts "Version explicitly written: #{read_version.green}"
+  end
+  
+  desc "Increments the patch version"
+  task :patch do
+    new_version = increment read_version, 2
+    write_version new_version
+    puts "Application patched: #{new_version.green}"
+  end
+  
+  desc "Increments the minor version and resets the patch"
+  task :minor do
+    incremented = increment read_version, 1
+    new_version = reset incremented, [2]
+    write_version new_version
+    puts "New version released: #{new_version.green}"
+  end
+  
+  desc "Increments the major version and resets both minor and patch"
+  task :major do
+    incremented = increment read_version, 0
+    new_version = reset incremented, [1, 2]
+    write_version new_version
+    puts "Major application version change: #{new_version.green}. Congratulations!"
+  end
+  
+  desc "Sets the development flag on"
+  task :dev do
+    version, flag = read_version.split '-'
+    new_version = [version, 'dev'].join '-'
+    write_version new_version
+    puts "Version in development: #{new_version.green}"
+  end
+  
+  desc "Sets the beta flag on"
+  task :beta do
+    version, flag = read_version.split '-'
+    new_version = [version, 'beta'].join '-'
+    write_version new_version
+    puts "Version in beta: #{new_version.green}"
+  end
+  
+  desc "Sets or increments the rc flag"
+  task :rc do
+    version, flag = read_version.split '-'
+    rc = /^rc(\d+)$/.match flag
+    if rc
+      new_version = [version, "rc#{rc[1].to_i+1}"].join '-'
+    else
+      new_version = [version, 'rc1'].join '-'
+    end
+    write_version new_version
+    puts "New version release candidate: #{new_version.green}"
+  end
+  
+  desc "Removes any version flags"
+  task :release do
+    version, flag = read_version.split '-'
+    write_version version
+    puts "Released stable version: #{version.green}"
+  end
+  
+end

data/spec/gitit_branch_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+module Gitit
+
+  describe Branch do
+
+    # -------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
+    describe "#testRepoBranch" do
+
+      before(:each) do
+        FileUtils.mkpath TEST_REPO_PATH
+        git = Git.new(TEST_REPO_PATH)
+        @myRepo = git.repo
+        @myRepo.init
+        @repoBranch = Gitit::Branch.new(@myRepo, "master")
+      end
+
+      it "will tell us if the branch is a valid branch" do
+      end
+
+      after(:each) do
+        FileUtils.rm_rf TEST_REPO_PATH
+      end
+
+    end
+  end
+
+end

data/spec/gitit_branches_spec.rb

@@ -0,0 +1,83 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+module Gitit
+
+  describe Branches do
+
+    # -------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
+    describe "#testBranchesExistance" do
+
+      before(:each) do
+        FileUtils.mkpath TEST_REPO_PATH
+        git = Git.new(TEST_REPO_PATH)
+        @myRepo = git.repo
+        @myRepo.init
+        @repoBranches = git.branches
+
+        File.open("#{TEST_REPO_PATH}/out.txt", "w+") { |file| file.write("boo!") }
+        `(cd #{TEST_REPO_PATH} && git add #{TEST_REPO_PATH}/out.txt && git commit -am "wip")`
+        
+        `(mkdir -p #{TEST_REPO_PATH_BARE} && cd #{TEST_REPO_PATH_BARE} && git init --bare)`
+        `(cd #{TEST_REPO_PATH} && git remote add origin #{TEST_REPO_PATH_BARE})`
+        `(cd #{TEST_REPO_PATH} && git push origin master --quiet)`
+
+      end
+
+      it "will successfully find a valid local branch" do
+        @repoBranches.existsLocally?("master").should eq true
+      end
+
+      it "will fail to find an invalid local branch" do
+        @repoBranches.existsLocally?("asdasdsad").should eq false
+      end
+
+      it "will successfully find a valid remote branch" do
+        @repoBranches.existsRemotely?("master").should eq true
+      end
+
+      it "will fail to find an invalid remote branch" do
+        @repoBranches.existsRemotely?("asdasdsad").should eq false
+      end
+
+      after(:each) do
+        FileUtils.rm_rf TEST_REPO_PATH
+        FileUtils.rm_rf TEST_REPO_PATH_BARE
+      end
+
+    end
+
+    # -------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
+    describe "#testBranchCreationLocally" do
+
+      before(:each) do
+        FileUtils.mkpath TEST_REPO_PATH
+        git = Git.new(TEST_REPO_PATH)
+        @myRepo = git.repo
+        @myRepo.init
+        @repoBranches = git.branches
+
+        File.open("#{TEST_REPO_PATH}/out.txt", "w+") { |file| file.write("boo!") }
+        `(cd #{TEST_REPO_PATH} && git add #{TEST_REPO_PATH}/out.txt && git commit -am "wip")`
+        
+        `(mkdir -p #{TEST_REPO_PATH_BARE} && cd #{TEST_REPO_PATH_BARE} && git init --bare)`
+        `(cd #{TEST_REPO_PATH} && git remote add origin #{TEST_REPO_PATH_BARE})`
+        `(cd #{TEST_REPO_PATH} && git push origin master --quiet)`
+
+      end
+    
+      after(:each) do
+        FileUtils.rm_rf TEST_REPO_PATH
+        FileUtils.rm_rf TEST_REPO_PATH_BARE
+      end
+
+    end
+
+    # -------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
+
+  end
+
+end
+

data/spec/gitit_config_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 module Gitit
 
-  describe Repo do
+  describe Config do
 
     # -------------------------------------------------------------------------
     # -------------------------------------------------------------------------

data/spec/gitit_spec.rb

@@ -11,6 +11,7 @@ module Gitit
       TMP_PATH = "/tmp/"
       BAD_PATH = "/adsdsadasdsa"
       TEST_REPO_PATH = "/tmp/test_git"
+      TEST_REPO_PATH_BARE = "/tmp/test_git_bare"
     
       before(:each) do
       end

data/spec/gitit_status_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 module Gitit
 
-  describe Repo do
+  describe Status do
 
     # -------------------------------------------------------------------------
     # -------------------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Pat Laplante
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies: []
 description: '"ruby git command line wrapper"'
 email:
@@ -33,12 +33,17 @@ files:
 - gitit.gemspecbak
 - lib/ext/string.rb
 - lib/gitit.rb
+- lib/gitit/command_branch.rb
+- lib/gitit/command_branches.rb
 - lib/gitit/command_config.rb
 - lib/gitit/command_executor.rb
 - lib/gitit/command_status.rb
 - lib/gitit/git.rb
 - lib/gitit/repo.rb
 - lib/gitit/version.rb
+- lib/tasks/version.rake
+- spec/gitit_branch_spec.rb
+- spec/gitit_branches_spec.rb
 - spec/gitit_config_spec.rb
 - spec/gitit_spec.rb
 - spec/gitit_status_spec.rb
@@ -71,6 +76,8 @@ test_files:
 - features/gitit.feature
 - features/step_definitions/gitit_steps.rb
 - features/support/env.rb
+- spec/gitit_branch_spec.rb
+- spec/gitit_branches_spec.rb
 - spec/gitit_config_spec.rb
 - spec/gitit_spec.rb
 - spec/gitit_status_spec.rb