MrMurano 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 907d8f71d784965567eff90d5ca1d88e29e08b93
-  data.tar.gz: c97c0feb26e1f54898a8c24da2d1e84d30e7a6c0
+  metadata.gz: e3d8ab1106bc7c79174b671075339b574dd017de
+  data.tar.gz: 53c2be7de4579527f6174ffbc0957109d3a29d51
 SHA512:
-  metadata.gz: 436e65b69681a6df929bcbd8fe8a55842363dd6f13abae114d35209d59d83c575d082e8fd01737693d368a725defd8116b6c1aa59e638c5e566a6f39121bce4a
-  data.tar.gz: 639221f5cb46bea583e71d3945e6a3b74043548fef47dea5b234e7dae232ca1a02db0c264a31150130947fb4e5802e8bb581e648a549e8ac571add4e15a57c09
+  metadata.gz: 36c4e019e27f568af176f0544ac3137c720aab8f4a7e49f83d00faefdea09b23d9e3bc8855cf008ed4b6c3620dda5bf58b28296303166bd3567f1a86505d2611
+  data.tar.gz: cc2e8f89109bd70c3fb6aaaa8bdf28c12caeeb6aedb47e0294445124a628d5b4d3e034259df287d92241be45a1eabaa3326ee7f4b37aecd089126711346d0ca9

data/.gitignore

@@ -13,6 +13,7 @@ Pods/
 pkg/
 
 .mrmuranorc
+.mrmuranorc.private
 files/
 endpoints/
 modules/

data/README.markdown

@@ -1,5 +1,7 @@
 # MrMurano
 
+[![Gem Version](https://badge.fury.io/rb/MrMurano.svg)](https://badge.fury.io/rb/MrMurano)
+
 Do more from the command line with [Murano](https://exosite.com/platform/)
 
 ## Usage
@@ -8,20 +10,18 @@ To start from an existing project in Murano
 ```
 mkdir myproject
 cd myproject
-mr syncdown --all
+mr syncdown -same
 ```
 
-Do stuff, see what changed: `mr status --all` or `mr diff -same`.
-Then deploy `mr syncup --all`
+Do stuff, see what changed: `mr status -same` or `mr diff -same`.
+Then deploy `mr syncup -same`
 
 
 
 ## Install
 
-Source install for now.
 ```
-git clone … MrMurano
-cd MrMurano
-rake install
+> gem install MrMurano
 ```
 
+

data/lib/MrMurano/Account.rb

@@ -86,6 +86,7 @@ module MrMurano
     end
 
     def products
+      raise "Missing Bussiness ID" if $cfg['business.id'].nil?
       r = endPoint('business/' + $cfg['business.id'] + '/product/')
       Net::HTTP.start(r.host, r.port, :use_ssl=>true) do |http|
         request = Net::HTTP::Get.new(r)
@@ -104,6 +105,7 @@ module MrMurano
     end
 
     def solutions
+      raise "Missing Bussiness ID" if $cfg['business.id'].nil?
       r = endPoint('business/' + $cfg['business.id'] + '/solution/')
       Net::HTTP.start(r.host, r.port, :use_ssl=>true) do |http|
         request = Net::HTTP::Get.new(r)

data/lib/MrMurano/Solution-Endpoint.rb

@@ -21,12 +21,13 @@ module MrMurano
       ret = get('/' + id.to_s)
       aheader = ret['script'].lines.first.chomp
       dheader = /^--#ENDPOINT (?i:#{ret['method']}) #{ret['path']}$/
+      rheader = %{--#ENDPOINT #{ret['method']} #{ret['path']}\n}
       if block_given? then
-        yield dheader + "\n" unless dheader =~ aheader
+        yield rheader unless dheader =~ aheader
         yield ret['script']
       else
         res = ''
-        res << dheader + "\n" unless dheader =~ aheader
+        res << rheader unless dheader =~ aheader
         res << ret['script']
         res
       end

data/lib/MrMurano/configFile.rb

@@ -4,6 +4,15 @@ require 'pp'
 
 module MrMurano
   class Config
+    #
+    #  internal    transient this-run-only things (also -c options)
+    #  specified   from --configfile
+    #  private     .mrmuranorc.private at project dir (for things you don't want to commit)
+    #  project     .mrmuranorc at project dir
+    #  user        .mrmuranorc at $HOME
+    #  system      .mrmuranorc at /etc
+    #  defaults    Internal hardcoded defaults
+    #
     ConfigFile = Struct.new(:kind, :path, :data) do
       def load()
         return if kind == :internal
@@ -24,13 +33,16 @@ module MrMurano
 
     attr :paths
 
+    CFG_SCOPES=%w{internal specified project private user system defaults}.map{|i| i.to_sym}.freeze
     CFG_FILE_NAME = '.mrmuranorc'.freeze
+    CFG_PRVT_NAME = '.mrmuranorc.private'.freeze
 
     def initialize
       @paths = []
       @paths << ConfigFile.new(:internal, nil, IniFile.new())
-      # :specified --config FILE goes here. (see load_specific)
+      # :specified --configfile FILE goes here. (see load_specific)
       prjfile = findProjectFile()
+      @paths << ConfigFile.new(:private, prjfile.dirname + CFG_PRVT_NAME)
       @paths << ConfigFile.new(:project, prjfile)
       @paths << ConfigFile.new(:user, Pathname.new(Dir.home) + CFG_FILE_NAME)
       @paths << ConfigFile.new(:system, Pathname.new('/etc') + CFG_FILE_NAME.sub(/^\./,''))
@@ -87,7 +99,7 @@ module MrMurano
     end
 
     # key is <section>.<key>
-    def get(key, scope=[:internal, :specified, :project, :user, :system, :defaults])
+    def get(key, scope=CFG_SCOPES)
       scope = [scope] unless scope.kind_of? Array
       paths = @paths.select{|p| scope.include? p.kind}
 
@@ -149,10 +161,21 @@ end
 command :config do |c|
   c.syntax = %{mr config [options] <key> [<new value>]}
   c.summary = %{Get and set options}
+  c.description = %{
+  You can get, set, or query config options with this command.  All config options
+  are in a 'section.key' format.  There is also a layer of scopes that the keys can
+  be saved in.
+
+  }
+
+  c.example %{See what the current combined config is}, 'mr config --dump'
+
   c.option '--system', 'Use only the system config file'
   c.option '--user', 'Use only the config file in $HOME'
-  c.option '--project', 'Use only the config file in the project'
+  c.option '--project', 'Use only the config file in the project (.mrmuranorc)'
+  c.option '--private', 'Use only the private config file in the project (.mrmuranorc.private)'
   c.option '--specified', 'Use only the config file from the --config option.'
+
   c.option '--unset', 'Remove key from config file.'
   c.option '--dump', 'Dump the current combined view of the config'
 
@@ -163,25 +186,29 @@ command :config do |c|
     elsif args.count == 0 then
       say_error "Need a config key"
     elsif args.count == 1 and not options.unset then
-      options.defaults :system=>false, :user=>false, :project=>false, :specified=>false
+      options.defaults :system=>false, :user=>false, :project=>false,
+        :specified=>false, :private=>false
 
       # For read, if no scopes, than all. Otherwise just those specified
       scopes = []
       scopes << :system if options.system
       scopes << :user if options.user
       scopes << :project if options.project
+      scopes << :private if options.private
       scopes << :specified if options.specified
-      scopes = [:internal, :specified, :project, :user, :system, :defaults] if scopes.empty?
+      scopes = MrMurano::Config.CFG_SCOPES if scopes.empty?
 
       say $cfg.get(args[0], scopes)
     else 
 
-      options.defaults :system=>false, :user=>false, :project=>true, :specified=>false
+      options.defaults :system=>false, :user=>false, :project=>true,
+        :specified=>false, :private=>false
       # For write, if scope is specified, only write to that scope.
       scope = :project
       scope = :system if options.system
       scope = :user if options.user
       scope = :project if options.project
+      scope = :private if options.private
       scope = :specified if options.specified
 
       args[1] = nil if options.unset

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-	VERSION = '1.0.0'.freeze
+	VERSION = '1.0.1'.freeze
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra