canzea 0.1.74 → 0.1.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 477ee9c77b2b7b9b5f0c95c7de5eb5e10c628d12
-  data.tar.gz: 5b89c6939bf27cf5ab983ddaca40ba4453b8bbdf
+  metadata.gz: f044b15355be39ada305f6a837d56a9c6fa53db1
+  data.tar.gz: 6e0136659aeb11b0568e3861027c57e8f82330b9
 SHA512:
-  metadata.gz: 222eaa3d567eb7afe540af568c21cf48348942418bbc57a82805899332351890afcb2fa0d38e3c39acce57e3f5d2ca373dd2b56cdd16340007ce6832253b268e
-  data.tar.gz: fcefe1a77597ec471541beedf12366cd8bc8bc1488cdf570b94d4ada9d63ba55622eea8724253157fb106eaa6c7659abbb93499d8d291ef8bac2dceb66a9dae1
+  metadata.gz: aeaedea93f32cde0fbeba592790b68592a9544f3cc25f0fabcd4d8bf1339b542156b8f7c7344de5e1699432b6932303a116ea503b48ce0aea19a429936c43230
+  data.tar.gz: df5ab8ecaa7b4b10bdf43dc04451c3bfaa9c31a01bd3d4d115d66bd7fef10ce38cb0227e1364d058b30579ef5f5b66d86a0a36dce305c8b44f83f74a00118ba9

data/lib/canzea/config.rb

@@ -5,7 +5,8 @@ module Canzea
   # Configuration defaults
   @config = {
               :log_level => "verbose",
-              :catalog_location => "#{Dir.home}/.ecosystem-catalog",
+              :config_location => "#{Dir.home}/.ecosystem-catalog",
+              :catalog_location => "#{Dir.home}/.ecosystem-catalog/catalog",
               :catalog_git => "https://gitlab.com/canzea/ecosystem-catalog.git",
               :catalog_branch => "develop",
               :git_repo => "/opt/cloud-profile",

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.74"
+  VERSION = "0.1.76"
 end

data/lib/canzea.rb

@@ -86,7 +86,7 @@ module Canzea
             Canzea::configure JSON.parse(file)
         end
 
-        extraConfig = Canzea::config[:catalog_location] + "/config.json"
+        extraConfig = Canzea::config[:config_location] + "/config.json"
         if File.exists?(extraConfig)
             if (opts[:verbose])
                 puts "-- Reading #{extraConfig}"

data/lib/commands/get-catalog.rb

@@ -10,9 +10,9 @@ class GetCatalog
     end
     def do(tag = nil)
         catalogLocation = Canzea::config[:catalog_location]
-        FileUtils.rm_rf "#{catalogLocation}/catalog"
-        FileUtils.mkdir_p "#{catalogLocation}/catalog"
-        catalogLocation = Pathname.new(catalogLocation).realpath
+        FileUtils.rm_rf "#{catalogLocation}"
+        FileUtils.mkdir_p "#{catalogLocation}"
+        catalogLocation = Pathname.new(catalogLocation).parent().realpath
         g = Git.clone(Canzea::config[:catalog_git], "catalog", :path => catalogLocation)
         g.branch Canzea::config[:catalog_branch]
         if (tag != nil)
@@ -20,7 +20,7 @@ class GetCatalog
             g.tag tag
         end
         puts "-- Branch '#{g.branch}' Commit #{g.log[0]}"
-        puts "-- Source #{catalogLocation}"
+        puts "-- Source #{catalogLocation}/catalog"
     end
 
 end

data/lib/helper-run-class.rb

@@ -7,7 +7,7 @@ require "trace-runner"
 
 class HelperRun
     def initialize ()
-        @basePath = "#{Pathname.new(Canzea::config[:catalog_location]).realpath}/catalog"
+        @basePath = "#{Pathname.new(Canzea::config[:catalog_location]).realpath}"
         @log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
     end
 

data/lib/plan-step-class.rb

@@ -7,7 +7,7 @@ require 'prepare-environment'
 
 class PlanStep
     def initialize ()
-        @basePath = "#{Pathname.new(Canzea::config[:catalog_location]).realpath}/catalog"
+        @basePath = "#{Pathname.new(Canzea::config[:catalog_location]).realpath}/"
         @log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.74
+  version: 0.1.76
 platform: ruby
 authors:
 - Canzea Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler