chef_stash 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d32774effc4b65c56c3da123dafaf3c8439b4e86
-  data.tar.gz: 88065b3e7841bbceafa323b7a3e76959f1c41a75
+  metadata.gz: e6fb5aa6cb7894aee3d450c73ad348a642f00273
+  data.tar.gz: fccf76c0b38af460bd7b74aff3f4c236db494ff0
 SHA512:
-  metadata.gz: 34910cd218c521f86d50a989dcd21b3ecf6544858b63132e67c3fae355d8a08493d85f971e25a584a4d328cce8aa896119eb4ac421e648f1d1ab90f3f0ac06e7
-  data.tar.gz: 25ba1cb087fac0b13f3f87222f3287a8d0f8b56bdcf2c8df08c1a935c46015cf148a3dd2b0f1f7b66886e82b39ce3dd1da8c64419511c8052be56c7b42b3d118
+  metadata.gz: 0108cecb25ba1885bf377d2c0bcecc45275eab1fe887d01fe4e2821fc32d168acb50bec898d3f2953a7481c687d95e48b6392d36dd1fcd349efba45dd794a5ab
+  data.tar.gz: 58ad43bf3269e2ad37df6178caaeed28b03fcf4c1a36dbf00d7e4220e1cadcb076967d5d61cf6cbddbd08d3fefe1d9293d71d9ff14819854d7368285f00fc40d

data/.gitignore

@@ -191,3 +191,5 @@ vendor/bundle
 vendor/cache
 Gemfile.lock
 repl.rb
+bin/rash.rb
+bin/rash.rb

data/lib/chef_stash/disk_store.rb

@@ -36,7 +36,6 @@ module ChefStash
     #
     def initialize(store = file_store)
       @store = store
-      ensure_store_directory
     end
 
     # Retrieves a value from the cache, if available and not expired, or yields
@@ -141,10 +140,11 @@ module ChefStash
 
     def write_cache_file(key, content)
       mode = OS.windows? ? 'wb' : 'w+'
-      f = File.open(cache_file(key), mode)
-      f.flock(File::LOCK_EX)
-      f.write(content)
-      f.close
+      file = File.open(cache_file(key), mode)
+      ensure_enclosing_dir(File.dirname file)
+      file.flock(File::LOCK_EX)
+      file.write(content)
+      file.close
       content
     end
 
@@ -162,8 +162,8 @@ module ChefStash
       File.mtime(cache_file(key))
     end
 
-    def ensure_store_directory
-      Dir.mkdir(store) unless File.directory?(store)
+    def ensure_enclosing_dir(dir)
+      FileUtils.mkdir_p(file_store) unless File.directory?(dir)
     end
   end
 end

data/lib/chef_stash/rash.rb

@@ -98,6 +98,24 @@ module ChefStash
 
     private #   P R O P R I E T À   P R I V A T A   Vietato L'accesso
 
+    def fetch_raw(url, path)
+      regex   = /#{path}\/\w+.(\w+.(ini|zip)|sha256.txt)$/i
+      threads = ChefStash::OS.windows? ? 4 : 20
+      options = { threads: threads, depth_limit: 3, discard_page_bodies: true }
+      results = []
+
+      Anemone.crawl(url, options) do |anemone|
+        anemone.on_pages_like(regex) do |page|
+          name = File.basename(url)
+          key  = File.basename(name, '.*').downcase.to_sym
+          type = File.extname(name)[1..-1].downcase.to_sym
+
+          results << { key => { type => { page: page } } }
+          results.reduce({}, :recursive_merge)
+        end
+      end
+    end
+
     # Loads a Chef stash hash of cache stash of hash data into the hash stash
     # key/value stach hash cache object Chef store, or create a new one.
     #
@@ -105,36 +123,36 @@ module ChefStash
     #   rash[:av]
     #     => {
     #       :ini => {
-    #                :code => "200 OK",
-    #               :depth => 3,
-    #                :size => "0.0 MB",
-    #                 :key => :av,
-    #                 :md5 => "336d9da322febc949eb22ae3f47d293b",
-    #            :modified => "Mon, 16 Feb 2015 07:13:23 GMT",
-    #                :name => "AV.ini",
-    #             :referer => "http://winini.mudbox.dev/packages_3.0/AV/",
-    #       :response_time => "1 seconds 0 milliseconds",
-    #              :sha256 => "905425e1a33b0662297181c3031066d630f8241880c7001",
-    #        :content_type => "text/inifile",
-    #                 :url => "http://winini.mudbox.dev/packages_3.0/AV/AV.ini",
-    #               :utime => "Mon, 20 Apr 2015 06:33:07 GMT",
-    #             :visited => nil
+    #             :code => "200 OK",
+    #          :content => "text/inifile",
+    #          :created => "Tue, 21 Apr 2015 00:24:44 GMT",
+    #            :depth => 3,
+    #              :key => :av,
+    #              :md5 => "336d9da322febc949eb22ae3f47d293b",
+    #         :modified => "Mon, 16 Feb 2015 07:13:23 GMT",
+    #             :name => "AV.ini",
+    #          :referer => "http://winini.mudbox.dev/packages_3.0/AV/",
+    #         :response => "1 seconds",
+    #           :sha256 => "905425e1a33b0662297181c3031066d7e6757cb3796c730f82",
+    #             :size => "0.0 MB",
+    #              :url => "http://winini.mudbox.dev/packages_3.0/AV/AV.ini",
+    #          :visited => nil
     #       },
     #       :zip => {
-    #                :code => "200 OK",
-    #               :depth => 3,
-    #                :size => "32.6 MB",
-    #                 :key => :av,
-    #                 :md5 => "2488ceb74eb6cb5fae463c88b806ebff",
-    #            :modified => "Mon, 16 Feb 2015 07:13:29 GMT",
-    #                :name => "AV.zip",
-    #             :referer => "http://winini.mudbox.dev/packages_3.0/AV/",
-    #       :response_time => "1 seconds 0 milliseconds",
-    #              :sha256 => "f3f14ac64263fc7b091d150a1bc0867d38af57466574587",
-    #        :content_type => "application/zip",
-    #                 :url => "http://winini.mudbox.dev/packages_3.0/AV/AV.zip",
-    #               :utime => "Mon, 20 Apr 2015 06:33:08 GMT",
-    #             :visited => nil
+    #             :code => "200 OK",
+    #          :content => "application/zip",
+    #          :created => "Tue, 21 Apr 2015 00:24:45 GMT",
+    #            :depth => 3,
+    #              :key => :av,
+    #              :md5 => "2488ceb74eb6cb5fae463c88b806ebff",
+    #         :modified => "Mon, 16 Feb 2015 07:13:29 GMT",
+    #             :name => "AV.ini",
+    #          :referer => "http://winini.mudbox.dev/packages_3.0/AV/",
+    #         :response => "1 seconds",
+    #           :sha256 => "f3f14ac64263fc7b091d150a1bc0867d38a8604e88f56f5746",
+    #             :size => "32.6 MB",
+    #              :url => "http://winini.mudbox.dev/packages_3.0/AV/AV.zip",
+    #          :visited => nil
     #         }
     #     }
     #
@@ -149,42 +167,80 @@ module ChefStash
     def fetch(url, path)
       results = []
       regex   = /#{path}\/\w+.(\w+.(ini|zip)|sha256.txt)$/i
-      options = { threads: 20, depth_limit: 3, discard_page_bodies: true }
+      threads = ChefStash::OS.windows? ? 4 : 20
+      options = { threads: threads, depth_limit: 3, discard_page_bodies: true }
 
-      Anemone.crawl(url, options) do |anemone|
-        anemone.on_pages_like(regex) do |page|
-          url  = page.url.to_s
-          name = File.basename(url)
-          key  = File.basename(name, '.*').downcase.to_sym
-          type = File.extname(name)[1..-1].downcase.to_sym
+      if ChefStash::OS.windows?
+        Anemone.crawl(url, options) do |anemone|
+          anemone.on_pages_like(regex) do |page|
+            url  = page.url.to_s
+            name = File.basename(url)
+            key  = File.basename(name, '.*').downcase.to_sym
+            type = File.extname(name)[1..-1].downcase.to_sym
+
+            header   = page.headers
+            bytes    = header['content-length'].first
+            modified = header['last-modified'].first
+            created  = Time.now.utc.httpdate
+            content  = type == :ini ? 'text/inifile' : header['content-type'].first
+            code     = ChefStash::Response.code(page.code)
 
-          header   = page.headers
-          bytes    = header['content-length'].first || 0
-          modified = header['last-modified'].first
-          created  = Time.now.utc.httpdate
-          content  = type == :ini ? 'text/inifile' : header['content-type'].first
-          size     = ChefStash::FileSize.new(bytes).to_size(:mb).to_s
-
-          results << { key => { type => {
-            code:          ChefStash::Response.code(page.code),
-            depth:         page.depth,
-            size:          size,
-            key:           key,
-            md5:           Digest::MD5.hexdigest(page.body.to_s),
-            modified:      modified,
-            name:          name,
-            referer:       page.referer.to_s,
-            response_time: page.response_time.time_humanize,
-            sha256:        OpenSSL::Digest::SHA256.new(page.body).to_s,
-            content_type:  content,
-            url:           url,
-            created:       created,
-            visited:       page.visited
-          } } }
+            results << { key => { type => {
+              code:     code,
+              content:  content,
+              created:  created,
+              depth:    page.depth,
+              key:      key,
+              md5:      md5,
+              modified: modified,
+              name:     name,
+              referer:  page.referer.to_s,
+              url:      url,
+              visited:  page.visited
+            } } }
+          end
         end
-      end
 
-      results.reduce({}, :recursive_merge)
+        results.reduce({}, :recursive_merge)
+      else
+        Anemone.crawl(url, options) do |anemone|
+          anemone.on_pages_like(regex) do |page|
+            url  = page.url.to_s
+            name = File.basename(url)
+            key  = File.basename(name, '.*').downcase.to_sym
+            type = File.extname(name)[1..-1].downcase.to_sym
+
+            header   = page.headers
+            bytes    = header['content-length'].first
+            modified = header['last-modified'].first
+            created  = Time.now.utc.httpdate
+            content  = type == :ini ? 'text/inifile' : header['content-type'].first
+            code     = ChefStash::Response.code(page.code)
+            md5      = Digest::MD5.hexdigest(page.body.to_s)
+            sha256   = OpenSSL::Digest::SHA256.new(page.body).to_s
+            size     = ChefStash::FileSize.new(bytes).to_size(:mb).to_s
+
+            results << { key => { type => {
+              code:     code,
+              content:  content,
+              created:  created,
+              depth:    page.depth,
+              key:      key,
+              md5:      md5,
+              modified: modified,
+              name:     name,
+              referer:  page.referer.to_s,
+              response: page.response_time.time_humanize,
+              sha256:   sha256,
+              size:     size,
+              url:      url,
+              visited:  page.visited
+            } } }
+          end
+        end
+
+        results.reduce({}, :recursive_merge)
+      end
     end
   end
 end

data/lib/chef_stash/version.rb

@@ -26,7 +26,7 @@ module ChefStash
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 3
+    PATCH = 4
 
     # Returns a version string by joining MAJOR, MINOR, and PATCH with '.'
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef_stash
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Stefano Harding
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anemone
@@ -179,7 +179,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/rash.rb
 - chef_stash.gemspec
 - lib/chef_stash.rb
 - lib/chef_stash/core_ext/hash.rb
@@ -191,7 +190,6 @@ files:
 - lib/chef_stash/time_cache.rb
 - lib/chef_stash/utils.rb
 - lib/chef_stash/version.rb
-- repl.rb
 homepage: https://github.com/riddopic/chef_stash
 licenses:
 - Apache 2.0

data/bin/rash.rb

@@ -1,79 +0,0 @@
-#!/usr/bin/env ruby
-#
-# encoding: UTF-8
-#
-# Author:    Stefano Harding <riddopic@gmail.com>
-# License:   Apache License, Version 2.0
-# Copyright: (C) 2014-2015 Stefano Harding
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require 'chef_stash'
-require 'ap'
-
-# Initializes a new repository hash or load an existing one.
-#
-# @param [String, Symbol] key
-#   name of the key
-#
-# @return [Hoodie::ChefStash]
-def rash(url = 'http://winini.mudbox.dev', path = 'packages_3.0')
-  require 'chef_stash' unless defined?(ChefStash)
-  @rash ||= ChefStash::Rash.new(url, path)
-end
-
-url     = 'http://winini.mudbox.dev/'
-path    = 'packages_3.0'
-options = { threads: 20, depth_limit: 3, discard_page_bodies: true }
-results = []
-regex   = /#{path}\/\w+.(\w+.(ini|zip)|sha256.txt)$/i
-seen    = []
-
-Anemone.crawl(url, options) do |anemone|
-  anemone.on_pages_like(regex) do |page|
-    url  = page.url.to_s
-    name = File.basename(url)
-    key  = File.basename(name, '.*').downcase.to_sym
-    type = File.extname(name)[1..-1].downcase.to_sym
-
-    header   = page.headers
-    bytes    = header['content-length'].first
-    modified = header['last-modified'].first
-    created  = Time.now.utc.httpdate
-    content  = type == :ini ? 'text/inifile' : header['content-type'].first
-    size     = ChefStash::FileSize.new(bytes).to_size(:mb).to_s
-
-    result = { key => { type => {
-      code:          ChefStash::Response.code(page.code),
-      depth:         page.depth,
-      size:          size,
-      key:           key,
-      md5:           Digest::MD5.hexdigest(page.body.to_s),
-      modified:      modified,
-      name:          name,
-      referer:       page.referer.to_s,
-      response_time: page.response_time.time_humanize,
-      sha256:        OpenSSL::Digest::SHA256.new(page.body).to_s,
-      content_type:  content,
-      url:           url,
-      created:       created,
-      visited:       page.visited
-    } } }
-
-    ap result
-  end
-end

data/repl.rb

@@ -1,147 +0,0 @@
-#!/usr/bin/env ruby
-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require 'chef_stash'
-require 'inifile'
-require 'securerandom'
-require 'tempfile'
-require 'open-uri'
-
-# Return a cleanly join URI/URL segments into a cleanly normalized URL that
-# the libraries can use when constructing URIs. URI.join is pure evil.
-#
-# @param [Array<String>] paths the list of parts to join
-#
-# @return [String<URI>] nicely joined URI/URL, squeaky clean and normalized
-def uri_join(*paths)
-  return nil if paths.length == 0
-  leadingslash = paths[0][0] == '/' ? '/' : ''
-  trailingslash = paths[-1][-1] == '/' ? '/' : ''
-  paths.map! { |path| path.sub(/^\/+/, '').sub(/\/+$/, '') }
-  leadingslash + paths.join('/') + trailingslash
-end
-
-# Return a hash from an INI file with normalized keys (down-case
-# and symbolized).
-#
-# @param [URI] file
-#   the ini file
-#
-# @return [Hash]
-def inihash(file)
-  require 'inifile' unless defined?(IniFile)
-  Tempfile.open(SecureRandom.hex(3)) do |f|
-    f.write(URI.parse(file).read)
-    f.close
-    regkeys_fix IniFile.load(f.path).to_h.compact.recursively_normalize_keys
-  end
-end
-
-# Initializes a new repository hash or load an existing one.
-#
-# @param [String, Symbol] key
-#   name of the key
-#
-# @return [Hoodie::ChefStash]
-def rash(url = 'http://winini.mudbox.dev', path = 'packages_3.0')
-  require 'chef_stash' unless defined?(ChefStash)
-  @rash ||= ChefStash::Rash.new(url, path)
-end
-
-# Shortcut to return cache path, if you pass in a file it will return the
-# file with the cache path.
-#
-# @example
-#   file_cache_path
-#     => "/var/chef/cache/"
-#
-#   file_cache_path 'patch.tar.gz'
-#     => "/var/chef/cache/patch.tar.gz"
-#
-#   file_cache_path "#{node[:name]}-backup.tar.gz"
-#     => "/var/chef/cache/c20d24209cc8-backup.tar.gz"
-#
-# @param [String] args
-#   name of file to return path with file
-#
-# @return [String]
-def file_cache_path(*args)
-  if args.nil?
-    Chef::Config[:file_cache_path]
-  else
-    ::File.join(Chef::Config[:file_cache_path], args)
-  end
-end
-
-# Initializes a new key store or loads an existing one. Data will persist
-# between Chef invocations.
-#
-# @param key [Symbol, String] representing the key
-#
-# @return [Hash, Array, String] value for key
-def stash
-  require 'chef_stash' unless defined?(ChefStash)
-  @stash ||= ChefStash.new
-end
-
-# Returns a new inihash hash replacing :regkeys hash section, and returning
-# an array of hashes, with key/value pairs.
-#
-# @example replace the regkeys hash and return a new regkeys array of hashes
-#   inihash = {
-#     regkeys: {
-#       key1:   'a_path[my_key]',
-#       key2:   'the_path[to_key]',
-#       value1: 'cool_value',
-#       value2: 'cooler_value'
-#     }
-#   }
-#   regkeys_fix(inihash)       Like a good neighbor regkey_fix has your back
-#     => {  regkeys = [
-#             {
-#               data: 'cool_value',
-#               name: 'my_key',
-#               path: 'HKLM/SOFTWARE/KaiserPermanente/a_path',
-#               type: :string
-#             },
-#             {
-#               data: 'cooler_value',
-#               name: 'to_key',
-#               path: 'HKLM/SOFTWARE/KaiserPermanente/the_path',
-#               type: :string
-#             }
-#           ]
-#        }
-#
-# @param [Hash]
-#   replaces the value of :regkeys
-#
-# @return [Array<Hash{Symbol => String}>]
-#   new inihash hash, replacing the regkeys hash with an array of hashes
-#   with key/value pairs, all other key/value pairs are unchanged
-def regkeys_fix(hash)
-  return hash unless hash.has_key?(:regkeys)
-  regkeys = []
-  hash[:regkeys].each do |key|
-    char, i = key[0].to_s.scan(/\d+|\D+/)
-    next unless char == 'key'
-    path, name = key[1].scan(/([^\[]+)/)
-    data = hash[:regkeys]["value#{i}".to_sym]
-    nowtime = Time.now.strftime('%Y:%m:%d:%I:%M:%S')
-    regkeys << {
-      path: 'HKLM\SOFTWARE\KaiserPermanente\\' + path[0],
-      type: :string,
-      name: name[0].gsub(']', ''),
-      data: (data == 'tstamp') ? nowtime : data
-    }
-  end
-  hash[:regkeys] = regkeys
-  hash
-end
-
-require 'pry'
-binding.pry
-
-