MrMurano 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d80701051b1837ecfe462e1487ec2cc238e54b9
-  data.tar.gz: 40e4cca578b534b259092f496d161697969e5bf6
+  metadata.gz: 08043fd1cb5602fd295ab448b40143d91cfbf6c2
+  data.tar.gz: 5446486ffce9f83d28f0ccb3172e882d480fbce2
 SHA512:
-  metadata.gz: e24973636dfb33ec1343886be2196d03338ea377a49f7b7a6598fe456c9b426c0064a89f9dc99e8199a18c226287a63ab1fe2deb958a44434f2103b925e18a1f
-  data.tar.gz: 53bed541a095ba1ecf0ba52003e3f13c0a5f2c563737a9e6bcd51634c3aebee02dbc1107f9a4bbb96e0ac2f5babb619a40c2fa4c6f347d9aac4371c5e62f675f
+  metadata.gz: 6037888fc38ad48dbdb315da51e2410aba14ffa6302b7286bcbe401a0c97a37e281f7ec48c5196132ebb3aa27f02f1cff14e697840feb80615089eca88e103bf
+  data.tar.gz: 65045aed6de179a7eb526f40361f0e8f4844ff396e7277408fa665fa8177c17b60d1c0a26b5bb0b28703859e1fe5cd0cae4ccecc3a4eefcae22e98591dd3e6d5

data/TODO.taskpaper

@@ -1,9 +1,11 @@
 
 Commands:
+	- Status will show things have changes when they don’t.
+	- Default for most commands should be -same @done(2016-08-02)
 	- Add Diff Command @done(2016-07-27)
 
 Endpoints:
-	- Add support for multiple endpoints in one file
+	- Add support for multiple endpoints in one file (maybe)
 	- Add directory support like in modules @done(2016-07-26)
   
 Files:
@@ -22,6 +24,7 @@ Product:
 
 Config:
 	- Think about adding dev,staging,prod system; how would that work?
+	Would it work ok to just use the --configfile option?
 
 SolutionBase:
 	- All network traffic is serialized. Make some parallel.

data/lib/MrMurano/Account.rb

@@ -126,15 +126,17 @@ module MrMurano
   end
 end
 
-# This is largely for testing.
 command :account do |c|
-  c.syntax = %{mr account ...}
+  c.syntax = %{mr account [options]}
   c.description = %{Show things about your account.}
   c.option '--businesses', 'Get businesses for user'
   c.option '--products', 'Get products for user (needs a business)'
   c.option '--solutions', 'Get solutions for user (needs a business)'
   c.option '--idonly', 'Only return the ids'
 
+  c.example %{List all businesses}, 'mr account --businesses'
+  c.example %{List solutions}, 'mr account --solutions -c business.id=XXXXXXXX'
+
   c.action do |args, options|
 
     acc = MrMurano::Account.new

data/lib/MrMurano/Solution-Users.rb

@@ -32,6 +32,7 @@ module MrMurano
           say_error ":: #{response.body}"
         end
       end
+      remote.reject!{|k,v| k==:synckey}
       post('/', remote)
     end
 
@@ -46,7 +47,7 @@ module MrMurano
       here.delete_if do |i|
         Hash.transform_keys_to_symbols(i)[@itemkey] == item[@itemkey]
       end
-      here << item
+      here << item.reject{|k,v| k==:synckey}
       local.open('wb') do |io|
         io.write here.map{|i| Hash.transform_keys_to_strings(i)}.to_yaml
       end

data/lib/MrMurano/Solution.rb

@@ -231,6 +231,7 @@ module MrMurano
         end
       end
       if options.create then
+        pp toadd
         toadd.each do |item|
           verbose "Adding item #{item[:synckey]}"
           unless $cfg['tool.dry'] then
@@ -296,8 +297,8 @@ module MrMurano
       tomod = []
       unchg = []
       if options.asdown then
-        todel = (herebox.keys - therebox.keys).map{|key| therebox[key] }
-        toadd = (therebox.keys - herebox.keys).map{|key| herebox[key] }
+        todel = (herebox.keys - therebox.keys).map{|key| herebox[key] }
+        toadd = (therebox.keys - herebox.keys).map{|key| therebox[key] }
       else
         toadd = (herebox.keys - therebox.keys).map{|key| herebox[key] }
         todel = (therebox.keys - herebox.keys).map{|key| therebox[key] }

data/lib/MrMurano/configFile.rb

@@ -156,22 +156,48 @@ module MrMurano
     end
 
   end
+
+  ##
+  # IF none of -same, then -same; else just the ones listed.
+  def self.checkSAME(opt)
+    unless opt.files or opt.endpoints or opt.modules or
+        opt.eventhandlers or opt.roles or opt.users then
+      opt.files = true
+      opt.endpoints = true
+      opt.modules = true
+      opt.eventhandlers = true
+    end
+    if opt.all then
+      opt.files = true
+      opt.endpoints = true
+      opt.modules = true
+      opt.eventhandlers = true
+      opt.roles = true
+      opt.users = true
+    end
+  end
 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.
-
+  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.example %{Query a value}, 'mr config solution.id'
+  c.example %{Set a new value; writing to the project config file}, 'mr config solution.id XXXXXXXX'
+  c.example %{Set a new value; writing to the private config file}, 'mr config --private solution.id XXXXXXXX'
+  c.example %{Set a new value; writing to the user config file}, 'mr config --user user.name my@email.address'
+  c.example %{Unset a value in a configfile. (lower scopes will become visible if set)},
+    'mr config diff.cmd --unset'
+
 
-  c.option '--system', 'Use only the system config file'
-  c.option '--user', 'Use only the config file in $HOME'
+  c.option '--system', 'Use only the system config file. (/etc/mrmuranorc)'
+  c.option '--user', 'Use only the config file in $HOME (.mrmuranorc)'
   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.'
@@ -196,7 +222,7 @@ command :config do |c|
       scopes << :project if options.project
       scopes << :private if options.private
       scopes << :specified if options.specified
-      scopes = MrMurano::Config.CFG_SCOPES if scopes.empty?
+      scopes = MrMurano::Config::CFG_SCOPES if scopes.empty?
 
       say $cfg.get(args[0], scopes)
     else 

data/lib/MrMurano/status.rb

@@ -3,12 +3,12 @@ command :status do |c|
   c.syntax = %{mr status [options]}
   c.description = %{Get the status of files}
   c.option '--all', 'Check everything'
-  c.option '-s','--files', %{Static Files}
-  c.option '-a','--endpoints', %{Endpoints}
-  c.option '-m','--modules', %{Modules}
-  c.option '-e','--eventhandlers', %{Event Handlers}
-  c.option '--roles', %{Roles}
-  c.option '--users', %{Users}
+  c.option '-s','--[no-]files', %{Static Files}
+  c.option '-a','--[no-]endpoints', %{Endpoints}
+  c.option '-m','--[no-]modules', %{Modules}
+  c.option '-e','--[no-]eventhandlers', %{Event Handlers}
+  c.option '--[no-]roles', %{Roles}
+  c.option '--[no-]users', %{Users}
 
   c.option '--[no-]asdown', %{Report as if syncdown instead of syncup}
   c.option '--[no-]diff', %{For modified items, show a diff}
@@ -16,16 +16,10 @@ command :status do |c|
   c.option '--[no-]showall', %{List unchanged as well}
   
   c.action do |args,options|
-    options.default :delete=>true, :create=>true, :update=>true, :diff=>false, :grouped => true
+    options.default :delete=>true, :create=>true, :update=>true, :diff=>false,
+      :grouped => true
 
-    if options.all then
-      options.files = true
-      options.endpoints = true
-      options.modules = true
-      options.roles = true
-      options.users = true
-      options.eventhandlers = true
-    end
+    MrMurano.checkSAME(options)
 
     def fmtr(item)
       if item.has_key? :local_path then
@@ -64,37 +58,37 @@ command :status do |c|
     if options.endpoints then
       sol = MrMurano::Endpoint.new
       ret = sol.status($cfg['location.base'] + $cfg['location.endpoints'], options)
-      gmerge(ret, ' EP ', options)
+      gmerge(ret, 'A', options)
     end
 
     if options.modules then
       sol = MrMurano::Library.new
       ret = sol.status( $cfg['location.base'] + $cfg['location.modules'], options)
-      gmerge(ret, 'MOD ', options)
+      gmerge(ret, 'M', options)
     end
 
     if options.eventhandlers then
       sol = MrMurano::EventHandler.new
       ret = sol.status( $cfg['location.base'] + $cfg['location.eventhandlers'], options)
-      gmerge(ret, ' EH ', options)
+      gmerge(ret, 'E', options)
     end
 
     if options.roles then
       sol = MrMurano::Role.new
       ret = sol.status( $cfg['location.base'] + $cfg['location.roles'], options)
-      gmerge(ret, 'ROLE', options)
+      gmerge(ret, 'R', options)
     end
 
     if options.users then
       sol = MrMurano::User.new
       ret = sol.status( $cfg['location.base'] + $cfg['location.users'], options)
-      gmerge(ret, 'USER', options)
+      gmerge(ret, 'U', options)
     end
 
     if options.files then
       sol = MrMurano::File.new
       ret = sol.status( $cfg['location.base'] + $cfg['location.files'], options)
-      gmerge(ret, 'FILE', options)
+      gmerge(ret, 'S', options)
     end
 
     pretty(@grouped, options) if options.grouped

data/lib/MrMurano/sync.rb

@@ -3,10 +3,10 @@ command :syncdown do |c|
   c.syntax = %{mr syncdown [options]}
   c.description = %{Sync project down from Murano}
   c.option '--all', 'Sync everything'
-  c.option '-s','--files', %{Sync Static Files}
-  c.option '-a','--endpoints', %{Sync Endpoints}
-  c.option '-m','--modules', %{Sync Modules}
-  c.option '-e','--eventhandlers', %{Sync Event Handlers}
+  c.option '-s','--[no-]files', %{Sync Static Files}
+  c.option '-a','--[no-]endpoints', %{Sync Endpoints}
+  c.option '-m','--[no-]modules', %{Sync Modules}
+  c.option '-e','--[no-]eventhandlers', %{Sync Event Handlers}
   c.option '--roles', %{Sync Roles}
   c.option '--users', %{Sync Users}
 
@@ -20,15 +20,7 @@ command :syncdown do |c|
   
   c.action do |args,options|
     options.default :delete=>true, :create=>true, :update=>true
-
-    if options.all then
-      options.files = true
-      options.endpoints = true
-      options.modules = true
-      options.roles = true
-      options.users = true
-      options.eventhandlers = true
-    end
+    MrMurano.checkSAME(options)
     
     if options.endpoints then
       sol = MrMurano::Endpoint.new
@@ -68,10 +60,10 @@ command :syncup do |c|
   c.syntax = %{mr syncup [options]}
   c.description = %{Sync project up into Murano}
   c.option '--all', 'Sync everything'
-  c.option '-s','--files', %{Sync Static Files}
-  c.option '-a','--endpoints', %{Sync Endpoints}
-  c.option '-m','--modules', %{Sync Modules}
-  c.option '-e','--eventhandlers', %{Sync Event Handlers}
+  c.option '-s','--[no-]files', %{Sync Static Files}
+  c.option '-a','--[no-]endpoints', %{Sync Endpoints}
+  c.option '-m','--[no-]modules', %{Sync Modules}
+  c.option '-e','--[no-]eventhandlers', %{Sync Event Handlers}
   c.option '--roles', %{Sync Roles}
   c.option '--users', %{Sync Users}
 
@@ -85,15 +77,7 @@ command :syncup do |c|
 
   c.action do |args,options|
     options.default :delete=>true, :create=>true, :update=>true
-
-    if options.all then
-      options.files = true
-      options.endpoints = true
-      options.modules = true
-      options.roles = true
-      options.users = true
-      options.eventhandlers = true
-    end
+    MrMurano.checkSAME(options)
 
     if options.endpoints then
       sol = MrMurano::Endpoint.new

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-	VERSION = '1.0.2'.freeze
+	VERSION = '1.0.3'.freeze
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MrMurano
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander