chef-monitor 0.1.2 → 0.1.3

data/.gitignore

@@ -1,3 +1,4 @@
+/bin/test*
 /pkg
 /config
 /orgs

data/chef-monitor.gemspec

@@ -21,5 +21,4 @@ Gem::Specification.new do |s|
   s.add_dependency "bunny", ">= 1.1.0"
   s.add_dependency "file-tail", ">= 1.0.12"
   s.add_dependency "daemons", ">= 1.1.9"
-  s.add_dependency "chef", ">= 10.0.0"
 end

data/lib/chef_monitor/item.rb

@@ -96,7 +96,8 @@ class Monitor
       begin
         item = rest.get_rest(object)
         result = JSON.pretty_generate(item)
-      rescue
+      rescue Exception => e
+        Monitor::Log.new(e.message + ' with object: ' + @organization + "/" + object , 'ERROR')
         return nil
       end
       return result
@@ -104,7 +105,7 @@ class Monitor
 
     def commit(path)
       current_dir = Dir.pwd
-      commit_dir = File.join(path, @organization, @object)
+      commit_dir = File.join(path, @organization)
       Dir.chdir(commit_dir)
       @version ? object = [@organization, @object, @name, @version].join('/') : object = [@organization, @object, @name].join('/')
       text = "User     : " + @user + "\nObject   : " + object + "\nAction   : " + @action + "\nLog Time : " + @time
@@ -121,7 +122,7 @@ class Monitor
 
     def commit_nohook(path)
       current_dir = Dir.pwd
-      commit_dir = File.join(path, @organization, @object)
+      commit_dir = File.join(path, @organization)
       Dir.chdir(commit_dir)
       %x(git config hooks.exclude true)
       %x(git add .)
@@ -149,6 +150,8 @@ class Monitor
         download.config[:latest] = true unless @version
         download.config[:force] = true
         result = (download.run())
+        file = File.join(download_dir, @name + "-" + @version, ".gitignore")
+        File.delete(file) if File.exist?(file)
         self.path = download_dir
       rescue Exception => e
         return e

data/lib/chef_monitor/itemlist.rb

@@ -85,10 +85,11 @@ class Monitor
       str[1..-1] if str[0] == '/'
     end
 
-    def get_rest_item(target)
+    def get_rest_item(object)
       begin
-        result = rest.get_rest(target)
-      rescue 
+        result = rest.get_rest(object)
+      rescue Exception => e
+        Monitor::Log.new(e.message + ' with object: ' + @organization + "/" + object , 'ERROR')
         return []
       end
       return result    

data/lib/chef_monitor/version.rb

@@ -16,6 +16,6 @@
 # limitations under the License.
 
 class Monitor
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

data/lib/chef_monitor/worker.rb

@@ -41,7 +41,6 @@ class Monitor
                 obj.delete(DOWNLOAD_PATH)
               else
                 items = Monitor::ItemList.new(data)              
- 
                 items.each do |item|
                   if data['action'] == "PUT"
                     item.download(DOWNLOAD_PATH)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-monitor
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.9
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 10.0.0
 description: Chef Monitoring tool to monitor all changes made
 email:
 - sander.botman@gmail.com