docman 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acc91c3fe53a884a192c08031fbf5895be348072
-  data.tar.gz: fdfe452438ff4d7dcbe76c5b87ded00693090c8d
+  metadata.gz: 60f35da305d3762ad05a4d33cb81e6752d50fdf7
+  data.tar.gz: 7a822f7232773f00a3b49999aa9b1b04aa3c6cc8
 SHA512:
-  metadata.gz: 7dc89592fd24ac0ce6c589903035efb1ef44f786133b6c479b94ad63c2c7b64731b183ac85eea496168d3c1f6c8c06016fe54ba733f982d16281e1d7af41677c
-  data.tar.gz: 5c6749805e4143a3ee027755baee5cd651015b4dd46afe1ad7eb809c1391a12fd2015b7e8f1a13eca03517f5fce41c4199adcf2fab583151ce3a6566da4cccf9
+  metadata.gz: 9d78656781c71bb6a4647f2d557143e606ef927d9f7ae262933a2111a1a30354b652be41de75d1bf82ea5631e28d949b7a391f2081b57874aa0c8c47dc1ced3c
+  data.tar.gz: 1434e1dc3ebcf169365bec5132d6c763a55afda1c23c20d2d9b282e2969e3c386702e3e6aa1b5a9c416181796c13861300715a543caae9e82a670e597b8c9807

data/bin/bump-version.sh

@@ -66,8 +66,10 @@ else
 fi
 
 if [ -n "$1" ]; then
+  git fetch
   BRANCH="state_$1"
-  git show-ref --verify --quiet "refs/heads/${BRANCH}"
+  #git show-ref --verify --quiet "refs/heads/${BRANCH}"
+  git ls-remote --exit-code . origin/state_stable &> /dev/null
   if [ $? == 0 ]; then
     git checkout ${BRANCH}
     git pull

data/lib/docman/info.rb

@@ -22,7 +22,7 @@ module Docman
             if state['source']['type'] == :retrieve_from_repo
               repo = state['source']['repo'] == :project_repo ? self['repo'] : state['source']['repo']
               external_state_info = read_yaml_from_file(repo, self['states_path'], state['source']['branch'], state['source']['file'])
-              state.deep_merge! external_state_info
+              state.deep_merge! external_state_info unless external_state_info.nil?
             end
           end
         end

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.32"
+  VERSION = "0.0.33"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docman
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Alexander Tolstikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler