MrMurano 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2c35398ec8949a3fc15cb9bb21f6bdb1940a7a0
-  data.tar.gz: 5364d2f10f5bcf8962c702da5790fcdf28cf4d17
+  metadata.gz: 37c49c0b975dd14d40e55d57a2c806931d442423
+  data.tar.gz: 98a232cf51e5155d5943ff02f5d2b32a62a76cb3
 SHA512:
-  metadata.gz: a1bf859c01ebb93ceb5bd9b3723b5495c5fefeacb89deef59614ee8f95c4ebe168a6c3b6bc2aac3845de33cdd1cbcfa9ec7d0b1f9a2837e931e571484e88e4a6
-  data.tar.gz: f8c22edda2251ae52e43a134042989868f14b7f16834d825d559c67062645e2de6dc9af5021f7e4fe84b7c3512426f69145c9790207e77ba6308e5677881eda9
+  metadata.gz: e40e5b6b729e25dec8ec4f07785805b2185ee9106dfe7bfc07e31ba75703ca14d56272056f6815aa7f3accaa3809fd200f5541b3fa8c9d2a576566c498d19e29
+  data.tar.gz: 1e067ca68bbc3948af5540d8c89afc1a2f3508b3466ee253dab8ec989cd8834fc80e2d91fe33b1a38f7aeed4b4b89cb3c609a58ab3b7dd0cb83b8ab92057ce2e

data/README.markdown

@@ -11,11 +11,12 @@ To start from an existing project in Murano
 mkdir myproject
 cd myproject
 mr config solution.id XXXXXX
-mr syncdown -same
+mr syncdown
 ```
 
-Do stuff, see what changed: `mr status -same` or `mr diff -same`.
-Then deploy `mr syncup -same`
+Do stuff, see what changed: `mr status` or `mr diff`.
+Then deploy with `mr syncup`
+
 
 
 

data/TODO.taskpaper

@@ -33,7 +33,7 @@ Config:
 
 SolutionBase:
 	- All network traffic is serialized. Make some parallel.
-	- Add the --curl verbose option.
+	- Add the --curl verbose option. @done(2016-08-12)
 	- Rebuild how local names and paths are computed from remote items. @done(2016-07-27)
 
 Bundles:

data/bin/mr

@@ -16,6 +16,9 @@ global_option('-n', '--dry', %{Don't run actions that make changes}) {
   $cfg['tool.dry'] = true
   $cfg['tool.verbose'] = true # dry implies verbose
 }
+global_option('-L', '--curl', 'Print out a curl command for each network call') {
+  $cfg['tool.curldebug'] = true
+}
 global_option '--skip-plugins', %{Don't load plugins. Good for when one goes bad.}
 
 global_option('-C', '--configfile FILE', %{Load additional configuration file}) {|file|
@@ -49,7 +52,7 @@ pgds = [
 if not ARGV.include? '--skip-plugins' then
   pgds << Pathname.new(ENV['MR_MURANO_PLUGIN_DIR']) if ENV.has_key? 'MR_MURANO_PLUGIN_DIR'
   pgds.each do |path|
-    next unless path.exist?
+    ext unless path.exist?
     path.each_child do |plugin|
       next if plugin.directory?
       next unless plugin.readable?

data/lib/MrMurano/Solution-File.rb

@@ -51,6 +51,14 @@ module MrMurano
       delete('/'+path)
     end
 
+    def curldebug(request)
+      # The upload will get printed out inside of upload. 
+      # Because we don't have the correct info here.
+      if request.method != 'PUT' then
+        super(request)
+      end
+    end
+
     ##
     # Upload a file
     def upload(local, remote)
@@ -78,6 +86,16 @@ module MrMurano
         request.content_length = form.content_length
         request.body = form.to_s
 
+        if $cfg['tool.curldebug'] then
+          a = []
+          a << %{curl -s -H 'Authorization: #{request['authorization']}'}
+          a << %{-H 'User-Agent: #{request['User-Agent']}'}
+          a << %{-X #{request.method}}
+          a << %{'#{request.uri.to_s}'}
+          a << %{-F file=@#{local.to_s}}
+          puts a.join(' ')
+        end
+
         response = http.request(request)
         case response
         when Net::HTTPSuccess
@@ -123,7 +141,9 @@ module MrMurano
       end
       raise "Not a directory: #{from.to_s}" unless from.directory?
 
-      Pathname.glob(from.to_s + '/**/*').map do |path|
+      Pathname.glob(from.to_s + '/**/*').reject do |path|
+        path.directory?
+      end.map do |path|
         name = toRemoteItem(from, path)
         name[:local_path] = path
         name

data/lib/MrMurano/Solution.rb

@@ -24,6 +24,19 @@ module MrMurano
       end
     end
 
+    def curldebug(request)
+      if $cfg['tool.curldebug'] then
+        a = []
+        a << %{curl -s -H 'Authorization: #{request['authorization']}'}
+        a << %{-H 'User-Agent: #{request['User-Agent']}'}
+        a << %{-H 'Content-Type: #{request.content_type}'}
+        a << %{-X #{request.method}}
+        a << %{'#{request.uri.to_s}'}
+        a << %{-d '#{request.body}'} unless request.body.nil?
+        puts a.join(' ')
+      end
+    end
+
     def endPoint(path='')
       parts = ['https:/', $cfg['net.host'], 'api:1'] + @uriparts
       s = parts.map{|v| v.to_s}.join('/')
@@ -48,6 +61,7 @@ module MrMurano
 
     def workit(request, &block)
       set_req_defaults(request)
+      curldebug(request)
       if block_given? then
         yield request, http()
       else

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-	VERSION = '1.1.1'.freeze
+	VERSION = '1.1.2'.freeze
 end
 

metadata

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