ki-repo 0.1.1 → 0.1.2

data/lib/data_access/repository_finder.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/data_access/repository_info.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/data_access/version_helpers.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -104,14 +104,14 @@ module Ki
     end
 
     def import_from_metadata(metadata, source=nil)
-      if defined?(@specific_version_id) && defined?(@create_new_version)
+      if specific_version_id && create_new_version
         raise "Can't define both specific_version_id '#{specific_version_id}' and create_new_version '#{create_new_version}'!"
       end
 
-      if defined?(@specific_version_id)
-        version_id = @specific_version_id
-      elsif defined? @create_new_version
-        component_id = @create_new_version
+      if specific_version_id
+        version_id = specific_version_id
+      elsif create_new_version
+        component_id = create_new_version
         version = finder.version(component_id)
         if version
           id = version.version_id.split("/").last
@@ -140,7 +140,7 @@ module Ki
       metadata_dir.metadata.cached_data = metadata.cached_data
       metadata_dir.metadata.version_id = version_id
       metadata_dir.metadata.save
-      if defined? @move_files
+      if move_files
         FileUtils.rm(metadata.path)
       end
       source_dirs = []
@@ -158,7 +158,7 @@ module Ki
 
 
     def delete_empty_source_dirs(source, source_dirs)
-      if defined? @move_files
+      if move_files
         expanded_source_dirs = {}
         source_dirs.each do |d|
           dir_entries(d).each do |expanded|
@@ -179,7 +179,7 @@ module Ki
       arr = str.split("/")
       ret = []
       c = arr.size
-      while (c > 0)
+      while c > 0
         ret << File.join(arr[0..c])
         c-=1
       end
@@ -187,7 +187,7 @@ module Ki
     end
 
     def to_repo(src, dest)
-      if defined? @move_files
+      if move_files
         FileUtils.mv(src, dest)
       else
         FileUtils.cp(src, dest)
@@ -223,7 +223,7 @@ module Ki
         if dir != "."
           FileUtils.mkdir_p File.join(out, dir)
         end
-        if defined? @copy
+        if copy
           FileUtils.cp(full_path, File.join(out, file_path))
         else
           FileUtils.ln_sf(full_path, File.join(out, file_path))

data/lib/data_access/version_iterators.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ module Ki
     attr_chain :finder, -> { version.component.finder }
     attr_chain :block
     attr_chain :internals
-    attr_chain :exclude_dependencies, -> { [] }, :convert => lambda { |list| Array.wrap(list).map { |s| /#{s}/ } }
+    attr_chain :exclude_dependencies, -> { [] }, :convert => lambda { |list| Array(list).map { |s| /#{s}/ } }
 
     def iterate_versions(&block)
       start_iteration do |version_iterator|
@@ -80,10 +80,10 @@ module Ki
   end
 
   class FileFinder < VersionIterator
-    attr_chain :files, -> { [] }, :convert => lambda { |list| Array.wrap(list).map { |s| FileRegexp.matcher(s) } }
-    attr_chain :exclude_files, -> { [] }, :convert => lambda { |list| Array.wrap(list).map { |s| FileRegexp.matcher(s) } }
-    attr_chain :tags, -> { [] }, :convert => lambda { |list| Array.wrap(list)}
-    attr_chain :exclude_tags, -> { [] }, :convert => lambda { |list| Array.wrap(list)}
+    attr_chain :files, -> { [] }, :convert => lambda { |list| Array(list).map { |s| FileRegexp.matcher(s) } }
+    attr_chain :exclude_files, -> { [] }, :convert => lambda { |list| Array(list).map { |s| FileRegexp.matcher(s) } }
+    attr_chain :tags, -> { [] }, :convert => lambda { |list| Array(list)}
+    attr_chain :exclude_tags, -> { [] }, :convert => lambda { |list| Array(list)}
 
     def file_map
       start_iteration do |ver_iterator|

data/lib/data_access/version_operations.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/data_storage/dir_base.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,9 +15,25 @@
 # limitations under the License.
 
 module Ki
-  module DirectoryBaseModule
+
+  class DirectoryBase
     attr_chain :parent, :require
 
+    def initialize(path)
+      init_from_path(path)
+    end
+
+    def self.find!(path, *locations)
+      locations.each do |loc|
+        dest = loc.go(path)
+        if dest.exists?
+          return dest
+        end
+      end
+      raise "Could not find '#{path}' from '#{locations.map { |l| l.path }.join("', '")}'"
+    end
+
+
     def init_from_path(path)
       @path = path
     end
@@ -84,23 +100,9 @@ module Ki
     def child(name)
       DirectoryBase.new(name)
     end
-  end
-
-  class DirectoryBase
-    include DirectoryBaseModule
-
-    def initialize(path)
-      init_from_path(path)
-    end
 
-    def self.find!(path, *locations)
-      locations.each do |loc|
-        dest = loc.go(path)
-        if dest.exists?
-          return dest
-        end
-      end
-      raise "Could not find '#{path}' from '#{locations.map { |l| l.path }.join("', '")}'"
+    def empty?(*sub_path)
+      Dir.entries(go(*sub_path).path).size == 2
     end
   end
 end

data/lib/data_storage/ki_home.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/data_storage/ki_json.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -71,7 +71,9 @@ module Ki
 
     def add_item(obj)
       edit_data do
-        @cached_data << obj
+        if !@cached_data.include?(obj)
+          @cached_data << obj
+        end
       end
       create_list_item(obj)
     end

data/lib/data_storage/repository.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/data_storage/version_metadata.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,16 +29,6 @@ module Ki
     attr_chain :operations, -> { Array.new }, :accessor => CachedData
     attr_chain :dependencies, -> { Array.new }, :accessor => CachedData
 
-    def add_file_info(name, size, *args)
-      extra = (args.select { |arg| arg.kind_of?(Hash) }.size!(0..1).first or {})
-      tags = (args - [extra]).flatten.uniq
-      file_hash = {"path" => name, "size" => size}.merge(extra)
-      if tags.size > 0
-        file_hash["tags"]=tags
-      end
-      files << file_hash
-    end
-
     # Comma separated list of dependency arguments
     # * dependency parameters can be given in the hash
     # TODO: version_id should be resolved through Version
@@ -58,41 +48,27 @@ module Ki
       operations << args
     end
 
-    def VersionMetadataFile.calculate_hashes(full_path, digester_ids)
-      digesters = {}
-      digester_ids.each do |h|
-        digesters[h] = KiCommand::KiExtensions.find!(File.join("/hashing", h)).digest
-      end
-      algos = digesters.values
-      File.open(full_path, "r") do |io|
-        while (!io.eof)
-          buf = io.readpartial(1024)
-          algos.each do |digester|
-            digester.update(buf)
-          end
-        end
-      end
-      digesters.each_pair do |h, digester|
-        digesters[h]=digester.hexdigest
-      end
-      digesters
-    end
-
     # Processes all files from source that match patterns and for each file calculates hashes and stores tags based on default_parameters
     def add_files(source, patterns, default_parameters={})
-      files_or_dirs = Array.wrap(patterns).map do |pattern|
+      files_or_dirs = Array(patterns).map do |pattern|
         Dir.glob(File.join(source, pattern))
       end.flatten
 
-      files = files_or_dirs.map do |file_or_dir|
-        if File.directory?(file_or_dir)
-          Dir.glob(File.join(file_or_dir, "**/*"))
+      files = []
+
+      files_or_dirs.each do |file_or_dir|
+        if File.file?(file_or_dir)
+          files << file_or_dir
         else
-          file_or_dir
+          Dir.glob(File.join(file_or_dir, "**/*")).each do |file|
+            if File.file?(file)
+              files << file
+            end
+          end
         end
-      end.flatten.sort
+      end
 
-      files.each do |file|
+      files.sort.each do |file|
         add_file(source, file, default_parameters)
       end
       self
@@ -106,7 +82,7 @@ module Ki
         extra["executable"]=true
       end
       if parameters["tags"]
-        tags = Array.wrap(parameters["tags"])
+        tags = Array(parameters["tags"])
         if tags && tags.size > 0
           extra["tags"]= tags
         end
@@ -119,6 +95,45 @@ module Ki
       end
       add_file_info(full_path[root.size+1..-1], size, extra)
     end
+
+    def add_file_info(name, size, *args)
+      extra = (args.select { |arg| arg.kind_of?(Hash) }.size!(0..1).first or {})
+      tags = (args - [extra]).flatten.uniq
+      file_hash = {"path" => name, "size" => size}.merge(extra)
+      if tags.size > 0
+        file_hash["tags"]=tags
+      end
+      files.each do |f|
+        if f["path"] == name
+          if f == file_hash
+            return
+          else
+            raise "'#{name}' has already been added to version, but with different attributes:\n- old: #{f.inspect}\n- new: #{file_hash.inspect}"
+          end
+        end
+      end
+      files << file_hash
+    end
+
+    def VersionMetadataFile.calculate_hashes(full_path, digester_ids)
+      digesters = {}
+      digester_ids.each do |h|
+        digesters[h] = KiCommand::KiExtensions.find!(File.join("/hashing", h)).digest
+      end
+      algos = digesters.values
+      File.open(full_path, "r") do |io|
+        while (!io.eof)
+          buf = io.readpartial(1024)
+          algos.each do |digester|
+            digester.update(buf)
+          end
+        end
+      end
+      digesters.each_pair do |h, digester|
+        digesters[h]=digester.hexdigest
+      end
+      digesters
+    end
   end
 
   module DependencyMethods

data/lib/ki_repo_all.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,9 @@ require_relative 'util/test'
 require_relative 'util/service_registry'
 require_relative 'util/hash'
 require_relative 'util/hash_cache'
+require_relative 'util/hash_log'
 require_relative 'util/simple_optparse'
+require_relative 'util/shell'
 
 require_relative 'data_storage/dir_base'
 require_relative 'data_storage/ki_json'
@@ -40,3 +42,7 @@ require_relative 'data_access/version_iterators'
 require_relative 'cmd/cmd'
 require_relative 'cmd/version_cmd'
 require_relative 'cmd/user_pref_cmd'
+
+require_relative 'web/default_rack_handler'
+require_relative 'web/rack_cmd'
+require_relative 'web/test_browser'

data/lib/util/attr_chain.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@
 # * :default makes it easy to isolate functionality to a default value while still making it easy to override the default behaviour
 # * :default adds easy lazy evalution and memoization to the attribute, default value is evaluated only if needed
 # * Testing becomes easier when objects have more exposed fields
-# * :require converts tricky nil exceptions in to useful errors. Instead of the "undefined method `bar' for nil:NilClass" you get a good error message that states which field was not defined
+# * :require converts tricky nil exceptions in to useful errors. Instead of the "undefined method 'bar' for nil:NilClass" you get a good error message that states which field was not defined
 #      foo.name.bar # if name has not been defined, raises "'name' has not been set" exception
 # * :immutable, :valid and :convert make complex validations and converts easy
 #

data/lib/util/exception_catcher.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/util/hash.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/util/hash_cache.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/util/hash_log.rb

@@ -0,0 +1,93 @@
+# encoding: UTF-8
+
+# Copyright 2012-2013 Mikko Apo
+#
+# 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.
+
+module Ki
+  # Generate hash object based log entries.
+  # @see log
+  module HashLog
+    HashLogThreadCurrentKey = :hash_log
+    HashLogMutex = Mutex.new
+
+    # Create a hash log entry or return current hash log entry
+    # * Supports hierarchic logs, where log entry can contain any number of sub entries
+    # * Supports parallel execution, threads can log in to one log structure
+    # * Logs start and stop time of execution
+    #
+    # Hierarchic logging works by keeping a stack of log entries in Thread local store
+    #
+    # @see set_hash_log_root_for_thread
+    # @see hash_log_current
+    def log(*args, &block)
+      current_log_entry = hash_log_current
+      # return
+      if args.empty? && block.nil?
+        current_log_entry
+      else
+        new_entry = {"start" => Time.now}
+        if args.first.kind_of?(String)
+          new_entry["name"] = args.delete_at(0)
+        end
+        if args.first.kind_of?(Hash)
+          new_entry.merge!(args.first)
+        end
+        log_list = nil
+        if current_log_entry
+          # there is current log entry, create a new sub log entry
+          HashLogMutex.synchronize do
+            log_list = current_log_entry["logs"] ||= []
+          end
+        else
+          # append new_entry to end of log list
+          log_list = Thread.current[HashLogThreadCurrentKey]
+        end
+        HashLogMutex.synchronize do
+          log_list << new_entry
+        end
+        if block
+          HashLogMutex.synchronize do
+            Thread.current[HashLogThreadCurrentKey] << new_entry
+          end
+          begin
+            block.call new_entry
+          rescue Exception => e
+            new_entry["exception"] = e.message
+            new_entry["backtrace"] = e.backtrace.join("\n")
+            raise
+          ensure
+            HashLogMutex.synchronize do
+              Thread.current[HashLogThreadCurrentKey].delete(new_entry)
+            end
+            new_entry["end"] = Time.now
+          end
+        else
+          new_entry
+        end
+      end
+    end
+
+    def set_hash_log_root_for_thread(root)
+      HashLogMutex.synchronize do
+        (Thread.current[HashLogThreadCurrentKey] ||= []) << root
+      end
+    end
+
+    def hash_log_current
+      HashLogMutex.synchronize do
+        (Thread.current[HashLogThreadCurrentKey] ||= []).last
+      end
+    end
+  end
+end