kubes 0.7.0 → 0.7.5

data/docs/search/search.js

@@ -0,0 +1,247 @@
+/**
+ * A simple JSON search
+ * Requires jQuery (v 1.7+)
+ *
+ * @author   Mat Hayward - Erskine Design
+ * @author   Rishikesh Darandale <Rishikesh.Darandale@gmail.com>
+ * @version  1.1
+ */
+
+var q, jsonFeedUrl = "/search/data.json",
+  $searchForm = $("[data-search-form]"),
+  $searchInput = $("[data-search-input]"),
+  $resultTemplate = $("#search-result"),
+  $resultsPlaceholder = $("[data-search-results]"),
+  $foundContainer = $("[data-search-found]"),
+  $foundTerm = $("[data-search-found-term]"),
+  $foundCount = $("[data-search-found-count]"),
+  $foundWord = $("[data-search-found-word]"),
+  allowEmpty = true,
+  showLoader = true,
+  loadingClass = "is--loading",
+  indexVar;
+
+
+$(document).ready( function() {
+  // hide items found string
+  $foundContainer.hide();
+  // initiate search functionality
+  initSearch();
+});
+
+function initSearch() {
+  if(!sessionStorage.getItem("lunrIndex")) {
+    // get the data
+    getData();
+  } else {
+    // Get search results if q parameter is set in querystring
+    if (getParameterByName('q')) {
+      q = decodeURIComponent(getParameterByName('q'));
+      $searchInput.val(q);
+      execSearch(q);
+    }
+  }
+
+  // Get search results on submission of form
+  $(document).on("submit", $searchForm, function(e) {
+    console.log("form submitted");
+    e.preventDefault();
+    q = $searchInput.val();
+    execSearch(q);
+  });
+}
+
+/**
+ * Get the JSON data
+ * Get the generated feeds/feed.json file so lunr.js can search it locally.
+ * Store the index in sessionStorage
+ */
+function getData(indexVar) {
+  jqxhr = $.getJSON(jsonFeedUrl)
+    .done(function(loaded_data){
+      // save the actual data as well
+      sessionStorage.setItem("actualData", JSON.stringify(loaded_data));
+      // set the index fields
+      indexVar = lunr(function () {
+        this.field('id');
+        this.field('title', { boost: 10 });
+        this.field('search_title', { boost: 10 });
+        this.field('content', { boost: 10 });
+        this.field('author');
+        loaded_data.forEach(function (doc, index) {
+          if ( doc.search_omit != "true" ) {
+            console.log("adding to index: " + doc.title);
+            this.add($.extend({ "id": index }, doc));
+          }
+        }, this)
+      });
+      // store the index in sessionStorage
+      sessionStorage.setItem("lunrIndex", JSON.stringify(indexVar));
+      // Get search results if q parameter is set in querystring
+      if (getParameterByName('q')) {
+        q = decodeURIComponent(getParameterByName('q'));
+        $searchInput.val(q);
+        execSearch(q);
+      }
+    })
+    .fail( function() {
+      console.log("get json failed...");
+    })
+    .always( function() {
+      console.log("finally...");
+    });
+}
+
+/**
+ * Get the search result from lunr
+ * @param {String} q
+ * @returns search results
+ */
+function getResults(q) {
+  var savedIndexData = JSON.parse(sessionStorage.getItem("lunrIndex"));
+  console.log("Indexed var from sessionStorage: " + savedIndexData);
+  return lunr.Index.load(savedIndexData).search(q);
+}
+
+/**
+ * Executes search
+ * @param {String} q
+ * @return null
+ */
+function execSearch(q) {
+  if (q != '' || allowEmpty) {
+    if (showLoader) {
+      toggleLoadingClass();
+    }
+    processResultData(getResults(q));
+    changeUrl("Search", "/search/?q=" + encodeURIComponent(q));
+  }
+}
+
+/**
+ * Toggles loading class on results and found string
+ * @return null
+ */
+function toggleLoadingClass() {
+  $resultsPlaceholder.toggleClass(loadingClass);
+  $foundContainer.toggleClass(loadingClass);
+}
+
+/**
+ * Process search result data
+ * @return null
+ */
+function processResultData(searchResults) {
+  $results = [];
+
+  console.log("Search Results: " + searchResults);
+  var resultsCount = 0,
+      results = "";
+
+  // Iterate over the results
+  searchResults.forEach(function(result) {
+    var loaded_data = JSON.parse(sessionStorage.getItem("actualData"));
+    var item = loaded_data[result.ref];
+    var result = populateResultContent($resultTemplate.html(), item);
+        resultsCount++;
+        results += result;
+  });
+
+
+  if (showLoader) {
+    toggleLoadingClass();
+  }
+
+  populateResultsString(resultsCount);
+  showSearchResults(results);
+}
+
+/**
+ * Add search results to placeholder
+ * @param {String} results
+ * @return null
+ */
+function showSearchResults(results) {
+  // Add results HTML to placeholder
+  $resultsPlaceholder.html(results);
+}
+
+/**
+ * Add results content to item template
+ * @param {String} html
+ * @param {object} item
+ * @return {String} Populated HTML
+ */
+function populateResultContent(html, item) {
+  var title = item.search_title || item.title
+  html = injectContent(html, title, '##Title##');
+  html = injectContent(html, item.link, '##Url##');
+  var content = text_truncate(item.content);
+  html = injectContent(html, content, '##Content##');
+  return html;
+}
+
+function text_truncate(str, length, ending) {
+  if (length == null) {
+    length = 255;
+  }
+  if (ending == null) {
+    ending = '...';
+  }
+  if (str.length > length) {
+    return str.substring(0, length - ending.length) + ending;
+  } else {
+    return str;
+  }
+};
+
+/**
+ * Populates results string
+ * @param {String} count
+ * @return null
+ */
+function populateResultsString(count) {
+  $foundTerm.text(q);
+  $foundCount.text(count);
+  if (count == 1)
+    $foundWord.text("result")
+  else
+    $foundWord.text("results")
+  $foundContainer.show();
+}
+
+ /* ==========================================================================
+    Helper functions
+    ========================================================================== */
+
+
+/**
+ * Gets query string parameter - taken from http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript
+ * @param {String} name
+ * @return {String} parameter value
+ */
+function getParameterByName(name) {
+  var match = RegExp('[?&]' + name + '=([^&]*)').exec(window.location.search);
+  return match && decodeURIComponent(match[1].replace(/\+/g, ' '));
+}
+
+/**
+ * Injects content into template using placeholder
+ * @param {String} originalContent
+ * @param {String} injection
+ * @param {String} placeholder
+ * @return {String} injected content
+ */
+function injectContent(originalContent, injection, placeholder) {
+  var regex = new RegExp(placeholder, 'g');
+  return originalContent.replace(regex, injection);
+}
+
+function changeUrl(page, url) {
+  if (typeof(window.history.pushState) != "undefined") {
+    var obj = { Page: page, Url: url };
+    window.history.pushState(obj, obj.Page, obj.Url);
+  } else {
+    console.log("Browser does not support HTML5.");
+  }
+}

data/docs/search/tips.md

@@ -0,0 +1,48 @@
+---
+title: Search Tips
+---
+
+Here are some useful search tips that can help to make searching more effective.
+
+## OR Searches
+
+By default, searches for multiple terms are combined with OR. If a document matches at least one of the search terms, it will show in the results. So:
+
+    install aws
+
+Will always result in more results just `install` by itself.
+
+
+## AND Searches
+
+To do an AND search of "install AND aws" mark both terms as required, you use a `+` sign in front of each term. Example:
+
+    +install +aws
+
+This results in pages only with both exactly install and aws.
+
+## Filter Terms
+
+To filter "keywords", you use a `-` sign in front of each term. Example:
+
+    +install -aws
+
+This results in pages only with install but filter or reject any pages with aws.
+
+## Wildcard
+
+You can use wildcards:
+
+    install*
+
+## Fields
+
+You can target specific fields:
+
+    title:install
+
+For fields see: [search data.json]({% link search/data.json %})
+
+## More Tips
+
+More search tips can be found at: [lunrjs searching](https://lunrjs.com/guides/searching.html)

data/lib/kubes.rb

@@ -16,6 +16,7 @@ require "hash_squeezer"
 require "kubes/version"
 require "memoist"
 require "rainbow/ext/string"
+require "singleton"
 require "yaml"
 
 # core helper libraries

data/lib/kubes/cli/compile.rb

@@ -16,7 +16,7 @@ class Kubes::CLI
 
     # auto build docker image and push image if kubes docker build not yet called
     def build_docker_image
-      return if File.exist?("#{Kubes.root}/.kubes/state/docker_image.txt")
+      return if File.exist?(Kubes.config.state.path)
       Build.new(@options).run
     end
   end

data/lib/kubes/command.rb

@@ -57,6 +57,7 @@ module Kubes
       end
 
       def check_project!(command_name)
+        return if command_name.nil?
         return if %w[-h -v completion completion_script help init new version].include?(command_name)
         Kubes.check_project!
       end

data/lib/kubes/compiler/decorator/base.rb

@@ -12,9 +12,9 @@ module Kubes::Compiler::Decorator
 
     def result
       if @data.key?(Kubes::Compiler::Dsl::Core::Blocks)
-        @data.results.each { |k,v| process(v) } # returns nil
+        @data.results.each { |k,v| run(v) } # returns nil
       else
-        process # processes and returns @data
+        run # processes and returns @data
       end
       @data # important to return @data so we keep the original @data structure: Blocks or Hash
     end

data/lib/kubes/compiler/dsl/core/base.rb

@@ -3,17 +3,13 @@ module Kubes::Compiler::Dsl::Core
     extend Fields
     include DslEvaluator
     include Helpers
-    include Kubes::Compiler::Shared::CustomHelpers
-    include Kubes::Compiler::Shared::CustomVariables
-    include Kubes::Compiler::Shared::PluginHelpers
+    include Kubes::Compiler::Shared::RuntimeHelpers
 
     def initialize(options={})
       @options = options
       @name = options[:name]
       @path = options[:path]
-      load_plugin_helpers
-      load_custom_variables
-      load_custom_helpers
+      load_runtime_helpers
     end
 
     def run

data/lib/kubes/compiler/dsl/core/fields.rb

@@ -64,7 +64,7 @@ module Kubes::Compiler::Dsl::Core
         result = instance_variable_get(ivar)
         result = {} if mode == "reset" # allow user to override with mode: reset option
         result ||= {} # maintain value for layering
-        result.deeper_merge!(value)
+        Kubes.deep_merge!(result, value)
         instance_variable_set(ivar, result)
       end
     end

data/lib/kubes/compiler/dsl/syntax/resource.rb

@@ -1,7 +1,6 @@
 module Kubes::Compiler::Dsl::Syntax
   class Resource < Kubes::Compiler::Dsl::Core::Base
     include Kubes::Compiler::Util::Normalize
-    include Kubes::Compiler::Shared::Helpers
 
     fields :apiVersion,  # <string>
            :kind,        # <string>
@@ -19,7 +18,7 @@ module Kubes::Compiler::Dsl::Syntax
     # top-level of resource is quite common
     def default_result
       data = top.merge(default_top)
-      data.deeper_merge!(default_result_append)
+      Kubes.deep_merge!(data, default_result_append)
       data.deep_stringify_keys!
       HashSqueezer.squeeze(data)
     end
@@ -64,7 +63,7 @@ module Kubes::Compiler::Dsl::Syntax
 
     # For generic kind
     def field(name, data)
-      top.deeper_merge!(name => data)
+      Kubes.deep_merge!(top, {name => data})
     end
   end
 end

data/lib/kubes/compiler/shared/helpers.rb

@@ -1,4 +1,5 @@
 require "base64"
+require "json"
 
 module Kubes::Compiler::Shared
   module Helpers
@@ -17,11 +18,12 @@ module Kubes::Compiler::Shared
     end
 
     def built_image_helper
-      path = Kubes.config.state.docker_image_path
+      path = Kubes.config.state.path
       unless File.exist?(path)
         raise Kubes::MissingDockerImage.new("Missing file with docker image built by kubes: #{path}. Try first running: kubes docker build")
       end
-      IO.read(path)
+      data = JSON.load(IO.read(path))
+      data['image']
     end
 
     def with_extra(value)

data/lib/kubes/compiler/shared/runtime_helpers.rb

@@ -0,0 +1,78 @@
+module Kubes::Compiler::Shared
+  module RuntimeHelpers
+    include Kubes::Compiler::Shared::Helpers
+
+    def load_runtime_helpers
+      load_custom_variables # also load custom variables
+      load_plugin_helpers
+      load_custom_helpers
+    end
+
+    @@custom_helpers_loaded = false
+    def load_custom_helpers
+      return if @@custom_helpers_loaded
+      paths = Dir.glob("#{Kubes.root}/.kubes/helpers/**/*.rb")
+      paths.sort_by! { |p| p.size } # so namespaces are loaded first
+
+      paths.each do |path|
+        filename = path.sub(%r{.*.kubes/helpers/},'').sub('.rb','')
+        module_name = filename.camelize
+        base_class_for_helper.send :include, module_name.constantize
+      end
+      @@custom_helpers_loaded = true
+    end
+
+    # Load plugin helper methods from project
+    @@plugin_helpers_loaded = false
+    def load_plugin_helpers
+      return if @@plugin_helpers_loaded
+      Kubes::Plugin.plugins.each do |klass|
+        helpers_class = "#{klass}::Helpers".constantize # IE: KubesAws::Helpers
+        base_class_for_helper.send :include, helpers_class
+      end
+      @@plugin_helpers_loaded = true
+    end
+
+    def base_class_for_helper
+      if self.is_a?(Kubes::Compiler::Strategy::Erb)
+        Kubes::Compiler::Strategy::Erb
+      else
+        Kubes::Compiler::Dsl::Core::Base
+      end
+    end
+
+    include DslEvaluator
+    # Load custom variables from project
+    @@custom_variables_loaded = false
+    def load_custom_variables
+      return if Kubes.kustomize?
+
+      ext = File.extname(@path)
+      role = @path.sub(%r{.*\.kubes/resources/},'').sub(ext,'').split('/').first # IE: web
+      kind = File.basename(@path).sub(ext,'') # IE: deployment
+      all = "all"
+      if @block_form
+        kind = kind.pluralize
+        all = all.pluralize
+      end
+
+      layers = [
+        "base.rb",
+        "#{Kubes.env}.rb",
+        "base/all.rb",
+        "base/all/#{Kubes.env}.rb",
+        "base/#{kind}.rb",
+        "base/#{kind}/base.rb",
+        "base/#{kind}/#{Kubes.env}.rb",
+        "#{role}/#{kind}.rb",
+        "#{role}/#{kind}/base.rb",
+        "#{role}/#{kind}/#{Kubes.env}.rb",
+      ]
+
+      layers.each do |layer|
+        path = "#{Kubes.root}/.kubes/variables/#{layer}"
+        evaluate_file(path)
+      end
+    end
+  end
+end