docman 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79315860ae754b3a074bb1229651542641846d77
-  data.tar.gz: 168507455be1385b378d456aa1bfa8de52c04700
+  metadata.gz: d21d4701a1e78242691f9855ef44f869eb4b8a13
+  data.tar.gz: 4265af6c323295622bf23f8228444a752358fdb0
 SHA512:
-  metadata.gz: 750664e21bf593b052a230e2721c0ab50502c730d4778a9f4af8a7f65c5a11b7d55be2d21a9e27f5140ca75fb113b20d1f792c96a4bf4da8a2763b166b124385
-  data.tar.gz: 816ac4cbd7a9cd4ba498b833cf64d3cec325e8a2963e5ecd3faa7c299ca566be77677233e086e369b4c0fb986610ba99ed64be29e9cd813618b7ae1bbcee3a37
+  metadata.gz: 556e35cc141fb5e8d3599c1d5043b6e08655585261d981ed51bc9d139b63cc46570bcea2fdc2d14256b71b99e120402df9b8ddcc3490d441f3f6c59ccfba4c06
+  data.tar.gz: 87775b0e968e87c7a4fb6293e948638dd669053f866d62f209e71356efc2c25a439fec0dff333eeecafb0df2121c7fc64d4abf389bd42da0f4778a55f32b577f

data/lib/docman/deployers/deployer.rb

@@ -42,6 +42,12 @@ module Docman
           end
         end
 
+        path = @docroot_config.root['full_build_path']
+        Dir.chdir path
+        if GitUtil.repo_changed? path
+          GitUtil.reset_repo path
+        end
+
         stored_config_hash = read_version_file_param('config_hash')
         @config_hash = Docman::Application.instance.config.config_hash
         @config_yaml = Docman::Application.instance.config.to_yaml
@@ -95,6 +101,8 @@ module Docman
 
       def read_file(path)
         YAML::load_file(path)
+      rescue
+        raise "Error in config file #{path}"
       end
 
       def read_version_file_param(param)

data/lib/docman/docroot_config.rb

@@ -78,6 +78,8 @@ module Docman
     end
 
     def states_dependin_on(name, version)
+      raise "There is no project with name '#{name}' exists in config" unless @names.has_key? name
+
       states = {}
       @names[name]['states'].each do |state, info|
         states[state] = info if info['version'] == version

data/lib/docman/git_util.rb

@@ -8,18 +8,30 @@ module Docman
 
     def self.exec(command)
       @logger.info command
-      @logger.info `#{command}`.delete!("\n")
+      result = `#{command}`.delete!("\n")
+      @logger.info result if result
+      raise result unless $?.exitstatus == 0
+      result
+    end
+
+    def self.reset_repo(path)
+      Dir.chdir path
+      exec 'git reset --hard'
+      exec 'git clean -f -d'
     end
 
     def self.get(repo, path, type, version)
       if File.directory? path and File.directory?(File.join(path, '.git'))
         Dir.chdir path
+
+        self.reset_repo(path) if self.repo_changed?(path)
+
         if type == 'branch'
           exec "git checkout #{version}"
           exec "git pull origin #{version}"
         end
         if type == 'tag'
-          exec "git fetch --tags"
+          exec 'git fetch --tags'
           exec "git checkout tags/#{version}"
         end
       else

data/lib/docman/version.rb

@@ -1,3 +1,3 @@
 module Docman
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

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