gitit 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba854b4f4b3733be57136c5e1d70feb11331afbc
-  data.tar.gz: 4ecd5975829070dc004a07874818defd00692282
+  metadata.gz: 4d6eccd073e28fa27af29c78a39eea588380603d
+  data.tar.gz: bdb4ea6a45379dd2bfd0f8e59fd6b01efa869284
 SHA512:
-  metadata.gz: f2ff59d8a930000b26247c0eaf95db88bd28eb15d4b057ddd610eef9efa2da450a338d2225f7878bfde79996c36171b00e21d99d50c320c8a324fb3e61d939a1
-  data.tar.gz: 6d9a15cce181b644f342afe116dbb5889790f57cae1fdc696289f0adb93fcd5ada7e68b5c578ba7a3069d5467591f9ed305b2b9973a668d071e1b97acbc89313
+  metadata.gz: e6145b556fde747538ae62b5491884790e22706a11149fb8812bb3bbcda4ad6f72d4c7fb1a2d743c351cba67c4188bb36026c5042ab7540d4bda2b4341deab7f
+  data.tar.gz: 8ffc989495d607f3c6e0f2fb0ed7bde73181822d50486c658d2d24ea322e9c108a9f9f999b471c9ce50f580f95055f78ace9f2358264970f3bf2a9066b4ca5e3

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/gitit/command_branches.rb

@@ -32,17 +32,16 @@ module Gitit
     # -------------------------------------------------------------------------
     # -------------------------------------------------------------------------
     def createLocalBranch(name)
-      raise "a branch with that name already exists" if existsLocally?(name)
-      executeCommand("branch #{name}")
+      executeCommand("branch --quiet #{name}")
       return true if $?.exitstatus == 0
       return false
     end
 
     # -------------------------------------------------------------------------
     # -------------------------------------------------------------------------
-    def pushLocalBranchToRemote(name, remote)
-      raise "a branch with that name does not exists" unless existsLocally?(name)
-      executeCommand("push #{remote} #{name}")
+    def pushLocalBranchToRemote(name, remote, force)
+      executeCommand("push --quiet -f #{remote} #{name}") if force
+      executeCommand("push --quiet #{remote} #{name}") unless force
       return true if $?.exitstatus == 0
       return false
     end

data/lib/gitit/command_config.rb

@@ -15,7 +15,7 @@ module Gitit
     
     # -------------------------------------------------------------------------
     # -------------------------------------------------------------------------
-    def getValue(key, decrypt = false)
+    def getValue(key)
       value = executeCommand("config --null --get #{key}")
       raise "failure running command" if $?.exitstatus != 0
       value = value.slice!(0, value.length-1)
@@ -30,6 +30,23 @@ module Gitit
       raise "failure running command" if $?.exitstatus != 0
     end
     
+    # -------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
+    def getGlobalValue(key)
+      value = executeCommand("config --global --null --get #{key}")
+      raise "failure running command" if $?.exitstatus != 0
+      value = value.slice!(0, value.length-1)
+      return value
+    end
+    
+    # -------------------------------------------------------------------------
+    # -------------------------------------------------------------------------
+    def setGlobalValue(key, value)
+      val = value
+      executeCommand("config --global \"#{key}\" \"#{val}\"")
+      raise "failure running command" if $?.exitstatus != 0
+    end
+    
   end
 
 

data/spec/gitit_branches_spec.rb

@@ -43,19 +43,6 @@ module Gitit
         @repoBranches.existsRemotely?("asdasdsad", "origin").should eq false
       end
 
-      it "will create a local branch successfully" do
-        @repoBranches.createLocalBranch("mybranch").should eq true
-        @repoBranches.existsLocally?("mybranch").should eq true
-        @repoBranches.existsRemotely?("mybranch", "origin").should eq false
-      end
-
-      it "will push a local branch to the remote" do
-        @repoBranches.createLocalBranch("mybranch").should eq true
-        @repoBranches.existsRemotely?("mybranch", "origin").should eq false
-        @repoBranches.pushLocalBranchToRemote("mybranch", "origin").should eq true        
-        @repoBranches.existsRemotely?("mybranch", "origin").should eq true
-      end
-
       after(:each) do
         FileUtils.rm_rf TEST_REPO_PATH
         FileUtils.rm_rf TEST_REPO_PATH_BARE
@@ -83,6 +70,38 @@ module Gitit
 
       end
     
+      it "will fail to create a local branch" do
+        @repoBranches.createLocalBranch("mybranch").should eq true
+        @repoBranches.createLocalBranch("mybranch").should eq false
+      end
+
+      it "will create a local branch successfully" do
+        @repoBranches.createLocalBranch("mybranch").should eq true
+        @repoBranches.existsLocally?("mybranch").should eq true
+        @repoBranches.existsRemotely?("mybranch", "origin").should eq false
+      end
+
+      it "will fail to push a local branch to an invalid remote" do
+        @repoBranches.createLocalBranch("mybranch").should eq true
+        @repoBranches.existsRemotely?("mybranch", "origin").should eq false
+        @repoBranches.pushLocalBranchToRemote("mybranch", "badorigin", false).should eq false        
+        @repoBranches.existsRemotely?("mybranch", "origin").should eq false
+      end
+
+      it "will push a local branch to the remote not forcing it" do
+        @repoBranches.createLocalBranch("mybranch").should eq true
+        @repoBranches.existsRemotely?("mybranch", "origin").should eq false
+        @repoBranches.pushLocalBranchToRemote("mybranch", "origin", false).should eq true        
+        @repoBranches.existsRemotely?("mybranch", "origin").should eq true
+      end
+
+      it "will push a local branch to the remote forcing it" do
+        @repoBranches.createLocalBranch("mybranch").should eq true
+        @repoBranches.existsRemotely?("mybranch", "origin").should eq false
+        @repoBranches.pushLocalBranchToRemote("mybranch", "origin", true).should eq true        
+        @repoBranches.existsRemotely?("mybranch", "origin").should eq true
+      end
+
       after(:each) do
         FileUtils.rm_rf TEST_REPO_PATH
         FileUtils.rm_rf TEST_REPO_PATH_BARE

data/spec/gitit_config_spec.rb

@@ -30,6 +30,17 @@ module Gitit
         value.should eq KEY_VALUE
       end
 
+      it "will set the specified global value successfully" do
+        lambda{@config.setGlobalValue(KEY_NAME, KEY_VALUE)}.should_not raise_error
+      end
+      
+      it "will retrieve the specified global value successfully" do
+        value = ""
+        lambda{@config.setGlobalValue(KEY_NAME, KEY_VALUE)}.should_not raise_error
+        lambda{value = @config.getGlobalValue(KEY_NAME)}.should_not raise_error
+        value.should eq KEY_VALUE
+      end
+
       after(:each) do
         FileUtils.rm_rf TEST_REPO_PATH
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitit
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Pat Laplante
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: ''