MrMurano 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30d48034f5391a6edaca9fbe64b6615b5d3224fa
-  data.tar.gz: f60967a24c13ba28b07e54d6c86bf5132be0017d
+  metadata.gz: 551631f8375cdb4352643781c4c47b7c1c4ec219
+  data.tar.gz: 7e341a608f0539f3b367ba5d0fd3e95dd4f15f84
 SHA512:
-  metadata.gz: 99a4c4bac57e8b288615b37f45e13e130818d8a5fe8b1022eca162d2e00763af5e690c90d94c51ec3938745cd232a01e44bfb3312d94f971f0b4052ec05c1cbf
-  data.tar.gz: f15d2379a7c6ac706dfc78c7b70eff1d5816345ff5dcba6a7a1b180f795a8960880822b0b62362877e9b708e647db0a86294b5f3e04c1d8eae63785836477a70
+  metadata.gz: d31e0375a7d1c2ba7a27acba8bc30d2c03f780bba0ededa5a0648b8e257e19899b91121c862bd2209c838b099a65c0578d55f06729cf0a776655f539f901491c
+  data.tar.gz: 55883ceda28d17b8bd6f72947c68cc59084e56f9d8d858b8036a4c9dda29728e3ddb7a6254778afe8a1e0c1b85f125f326f2c8895a3167191a02078ba3f3c16d

data/README.markdown

@@ -10,6 +10,7 @@ To start from an existing project in Murano
 ```
 mkdir myproject
 cd myproject
+mr config solution.id XXXXXX
 mr syncdown -same
 ```
 
@@ -23,5 +24,32 @@ Then deploy `mr syncup -same`
 ```
 > gem install MrMurano
 ```
+Or
+```
+> gem update MrMurano
+```
+
+## Features
+
+### Sub-directories
+
+For the endpoints, modules, and eventhandlers directories. The can contain both
+files or a sub-directory of files.  This allows for keeping common things grouped
+together.  Or adding a git submodule in to manage reusable chunks.
+
+
+
+### Bundles
+
+MrMuanro allows adding bundles of resources to your project.
+
+A Bundle is a group of modules, endpoints, and static files.
+
+Bundles live in the 'bundle' directory.  Each bundle is a directory that matches
+the layout of a project. (with directories for endpoints, modules, files, etc)
+
+The items in bundles are layered by sorting the bundle names. Then your project's
+items are layered on top.  This builds the list of what is synced.  It also allows
+you to override things that are in a bundle from you project.
 
 

data/TODO.taskpaper

@@ -1,12 +1,12 @@
 
 Commands:
-	- First time run needs to be smoothed out.
 	- Status will show things have changes when they don’t.
+	- First time run needs to be smoothed out. @done(2016-08-09)
 	- Default for most commands should be -same @done(2016-08-02)
 	- Add Diff Command @done(2016-07-27)
 
 Account:
-	- Netrc library (or the netrc format) doesn't allow '#' in passwords.
+	- Netrc library (or the netrc format) doesn't allow '#' in passwords. @done(2016-08-10)
 
 Endpoints:
 	- Add support for multiple endpoints in one file (maybe)
@@ -37,7 +37,8 @@ SolutionBase:
 	- Rebuild how local names and paths are computed from remote items. @done(2016-07-27)
 
 Bundles:
-	- Work on design
+	- Test syncdown behavor.
+	- Work on design @done(2016-08-09)
 	Thinking of something like VIM bundles.  A directory of directories. Each with a
 	manafest file? (maybe)  A Bundle is a group of modules, endpoints, static files
 	and the other things.  

data/lib/MrMurano/Account.rb

@@ -1,12 +1,55 @@
-require 'netrc'
 require 'uri'
 require 'net/http'
 require 'json'
 require 'date'
 require 'pp'
 require 'terminal-table'
+require 'pathname'
+require 'yaml'
 
 module MrMurano
+  class Passwords
+    def initialize(path)
+      path = Pathname.new(path) unless path.kind_of? Pathname
+      @path = path
+      @data = nil
+    end
+    def load()
+      if @path.exist? then
+        @path.chmod(0600)
+        @path.open('rb') do |io|
+          @data = YAML.load(io)
+        end
+      end
+    end
+    def save()
+      @path.open('wb') do |io|
+        io << @data.to_yaml
+      end
+      @path.chmod(0600)
+    end
+    def set(host, user, pass)
+      unless @data.kind_of? Hash then
+        @data = {host=>{user=>pass}}
+        return
+      end
+      hd = @data[host]
+      if hd.nil? or not hd.kind_of?(Hash) then
+        hd = {user=>pass}
+        return
+      end
+      hd[user] = pass
+      return
+    end
+    def get(host, user)
+      return nil unless @data.kind_of? Hash
+      return nil unless @data.has_key? host
+      return nil unless @data[host].kind_of? Hash
+      return nil unless @data[host].has_key? user
+      return @data[host][user]
+    end
+  end
+
   class Account
 
 
@@ -21,21 +64,14 @@ module MrMurano
         user = ask("Account name: ")
         $cfg.set('user.name', user, :user)
       end
-      # Maybe in the future use Keychain.  For now all in Netrc.
-#      if (/darwin/ =~ RUBY_PLATFORM) != nil then
-#        # macOS
-#        pws = `security 2>&1 >/dev/null find-internet-password -gs "#{host}" -a "#{user}"`
-#        pws.strip!
-#        pws.sub!(/^password: "(.*)"$/, '\1')
-#        return pws
-      # Use Netrc
-      nrc = Netrc.read
-      ruser, pws = nrc[host]
-      pws = nil unless ruser == user
+      pff = Pathname.new(ENV['HOME']) + '.mrmurano/passwords'
+      pf = Passwords.new(pff)
+      pf.load
+      pws = pf.get(host, user)
       if pws.nil? then
         pws = ask("Password:  ") { |q| q.echo = "*" }
-        nrc[host] = user, pws
-        nrc.save
+        pf.set(host, user, pws)
+        pf.save
       end
       {
         :email => $cfg['user.name'],

data/lib/MrMurano/Solution-Endpoint.rb

@@ -9,6 +9,7 @@ module MrMurano
     def initialize
       super
       @uriparts << 'endpoint'
+      @location = $cfg['location.endpoints']
     end
 
     ##
@@ -80,7 +81,7 @@ module MrMurano
       name << '.lua'
     end
 
-    def toremotename(from, path)
+    def toRemoteItem(from, path)
       # read first line of file and get method/path from it?
       path = Pathname.new(path) unless path.kind_of? Pathname
       aheader = path.readlines().first

data/lib/MrMurano/Solution-File.rb

@@ -12,6 +12,7 @@ module MrMurano
       super
       @uriparts << 'file'
       @itemkey = :path
+      @location = $cfg['location.files']
     end
 
     ##
@@ -69,7 +70,8 @@ module MrMurano
       # Most of these pull into ram.  So maybe just go with that. Would guess that
       # truely large static content is rare, and we can optimize/fix that later.
 
-      form = HTTP::FormData.create(:file=>HTTP::FormData::File.new(local.to_s))
+      file = HTTP::FormData::File.new(local.to_s, {:mime_type=>remote[:mime_type]})
+      form = HTTP::FormData.create(:file=>file)
       req = Net::HTTP::Put.new(uri)
       workit(req) do |request,http|
         request.content_type = form.content_type
@@ -92,8 +94,9 @@ module MrMurano
       name
     end
 
-    def toremotename(from, path)
-      name = super(from, path)
+    def toRemoteItem(from, path)
+      item = super(from, path)
+      name = item[:name]
       name = '/' if name == $cfg['files.default_page']
       name = "/#{name}" unless name.chars.first == '/'
 
@@ -113,7 +116,7 @@ module MrMurano
         itemA[:checksum] != itemB[:checksum])
     end
 
-    def locallist(from)
+    def localitems(from)
       from = Pathname.new(from) unless from.kind_of? Pathname
       unless from.exist? then
         return []
@@ -121,14 +124,9 @@ module MrMurano
       raise "Not a directory: #{from.to_s}" unless from.directory?
 
       Pathname.glob(from.to_s + '/**/*').map do |path|
-        name = toremotename(from, path)
-        case name
-        when Hash
-          name[:local_path] = path
-          name
-        else
-          {:local_path => path, :name => name}
-        end
+        name = toRemoteItem(from, path)
+        name[:local_path] = path
+        name
       end
     end
 

data/lib/MrMurano/Solution-Services.rb

@@ -94,6 +94,7 @@ module MrMurano
       super
       @uriparts << 'library'
       @itemkey = :alias
+      @location = $cfg['location.modules']
     end
 
     def tolocalname(item, key)
@@ -102,7 +103,7 @@ module MrMurano
     end
 
 
-    def toremotename(from, path)
+    def toRemoteItem(from, path)
       name = path.basename.to_s.sub(/\..*/, '')
       {:name => name}
     end
@@ -118,6 +119,7 @@ module MrMurano
       super
       @uriparts << 'eventhandler'
       @itemkey = :alias
+      @location = $cfg['location.eventhandlers']
     end
 
     def list
@@ -145,7 +147,7 @@ module MrMurano
       "#{item[:name]}.lua"
     end
 
-    def toremotename(from, path)
+    def toRemoteItem(from, path)
       path = Pathname.new(path) unless path.kind_of? Pathname
       aheader = path.readlines().first
       md = /--#EVENT (\S+) (\S+)/.match(aheader)

data/lib/MrMurano/Solution-Users.rb

@@ -32,7 +32,7 @@ module MrMurano
           say_error ":: #{response.body}"
         end
       end
-      remote.reject!{|k,v| k==:synckey}
+      remote.reject!{|k,v| k==:synckey or k==:bundled}
       post('/', remote)
     end
 
@@ -74,7 +74,7 @@ module MrMurano
       into
     end
 
-    def locallist(from)
+    def localitems(from)
       from = Pathname.new(from) unless from.kind_of? Pathname
       if not from.exist? then
         say_warning "Skipping missing #{from.to_s}"
@@ -90,7 +90,7 @@ module MrMurano
       from.open {|io| here = YAML.load(io) }
       here = [] if here == false
 
-      here
+      here.map{|i| Hash.transform_keys_to_symbols(i)}
     end
   end
 
@@ -100,6 +100,7 @@ module MrMurano
       super
       @uriparts << 'role'
       @itemkey = :role_id
+      @location = $cfg['location.roles']
     end
   end
 
@@ -108,6 +109,7 @@ module MrMurano
     def initialize
       super
       @uriparts << 'user'
+      @location = $cfg['location.users']
     end
 
     def upload(local, remote)

data/lib/MrMurano/Solution.rb

@@ -14,6 +14,8 @@ module MrMurano
       raise "No solution!" if @sid.nil?
       @uriparts = [:solution, @sid]
       @itemkey = :id
+      @locationbase = $cfg['location.base']
+      @location = nil
     end
 
     def verbose(msg)
@@ -94,14 +96,14 @@ module MrMurano
     # …
 
     ##
-    # Compute a remote resource name from the local path
+    # Compute a remote item hash from the local path
     # @param root Pathname: Root path for this resource type from config files
     # @param path Pathname: Path to local item 
-    # @return String: remote resource name
-    def toremotename(root, path)
+    # @return Hash: hash of the details for the remote item for this path
+    def toRemoteItem(root, path)
       path = Pathname.new(path) unless path.kind_of? Pathname
       root = Pathname.new(root) unless root.kind_of? Pathname
-      path.relative_path_from(root).to_s
+      {:name => path.relative_path_from(root).to_s}
     end
 
     ##
@@ -129,13 +131,51 @@ module MrMurano
       dest = into + name
     end
 
-    def locallist(from)
-      from = Pathname.new(from) unless from.kind_of? Pathname
-      unless from.exist? then
-        return []
+    ##
+    # So, for bundles this needs to look at all the places and build up the mered
+    # stack of local items.
+    #
+    # Which means it needs the from to be split into the base and the sub so we can
+    # inject bundle directories.
+
+    ##
+    # Get a list of local items.
+    #
+    # This collects items in the project and all bundles.
+    def locallist()
+      # so. if @locationbase/bundles exists
+      #  gather and merge: @locationbase/bundles/*/@location
+      # then merge @locationbase/@location
+      #
+
+      bundleDir = $cfg['location.bundles'] or 'bundles'
+      bundleDir = 'bundles' if bundleDir.nil?
+      items = {}
+      if (@locationbase + bundleDir).directory? then
+        (@locationbase + bundleDir).children.sort.each do |bndl|
+          if (bndl + @location).exist? then
+            verbose("Loading from bundle #{bndl.basename}")
+            bitems = localitems(bndl + @location)
+            bitems.map!{|b| b[:bundled] = true; b} # mark items from bundles.
+
+            
+            # use synckey for quicker merging.
+            bitems.each { |b| items[synckey(b)] = b }
+          end
+        end
       end
-      raise "Not a directory: #{from.to_s}" unless from.directory?
+      if (@locationbase + @location).exist? then
+        bitems = localitems(@locationbase + @location)
+        # use synckey for quicker merging.
+        bitems.each { |b| items[synckey(b)] = b }
+      end
+
+      items.values
+    end
 
+    ##
+    # Get a list of local items rooted at #from
+    def localitems(from)
       from.children.map do |path|
         if path.directory? then
           # TODO: look for definition. ( ?.rockspec? ?mr.modules? ?mr.manifest? )
@@ -150,14 +190,11 @@ module MrMurano
       end.select do |path|
         path.extname == '.lua'
       end.map do |path|
-        name = toremotename(from, path)
-        case name
-        when Hash
-          name[:local_path] = path
-          name
-        else
-          {:local_path => path, :name => name}
-        end
+        # sometimes this is a name, sometimes it is an item.
+        # do I want to keep that? NO.
+        name = toRemoteItem(from, path)
+        name[:local_path] = path
+        name
       end
     end
 
@@ -167,6 +204,10 @@ module MrMurano
     end
 
     def download(local, item)
+      if item[:bundled] then
+        say_warning "Not downloading into bundled item #{synckey(item)}"
+        return
+      end
       local.dirname.mkpath
       id = item[@itemkey.to_sym]
       local.open('wb') do |io|
@@ -180,10 +221,10 @@ module MrMurano
       dest.unlink
     end
 
-    def syncup(from, options=Commander::Command::Options.new)
+    def syncup(options=Commander::Command::Options.new)
       itemkey = @itemkey.to_sym
       options.asdown=false
-      dt = status(from, options)
+      dt = status(options)
       toadd = dt[:toadd]
       todel = dt[:todel]
       tomod = dt[:tomod]
@@ -214,9 +255,12 @@ module MrMurano
       end
     end
 
-    def syncdown(into, options=Commander::Command::Options.new)
+    # FIXME this still needs the path passed in.
+    # Need to think some more on how syncdown works with bundles.
+    def syncdown(options=Commander::Command::Options.new)
       options.asdown = true
-      dt = status(into, options)
+      dt = status(options)
+      into = @locationbase + @location
       toadd = dt[:toadd]
       todel = dt[:todel]
       tomod = dt[:tomod]
@@ -275,9 +319,9 @@ module MrMurano
       df
     end
 
-    def status(from, options=Commander::Command::Options.new)
+    def status(options=Commander::Command::Options.new)
       there = list()
-      here = locallist(from)
+      here = locallist()
       itemkey = @itemkey.to_sym
  
       therebox = {}

data/lib/MrMurano/status.rb

@@ -57,37 +57,37 @@ command :status do |c|
     
     if options.endpoints then
       sol = MrMurano::Endpoint.new
-      ret = sol.status($cfg['location.base'] + $cfg['location.endpoints'], options)
+      ret = sol.status(options)
       gmerge(ret, 'A', options)
     end
 
     if options.modules then
       sol = MrMurano::Library.new
-      ret = sol.status( $cfg['location.base'] + $cfg['location.modules'], options)
+      ret = sol.status(options)
       gmerge(ret, 'M', options)
     end
 
     if options.eventhandlers then
       sol = MrMurano::EventHandler.new
-      ret = sol.status( $cfg['location.base'] + $cfg['location.eventhandlers'], options)
+      ret = sol.status(options)
       gmerge(ret, 'E', options)
     end
 
     if options.roles then
       sol = MrMurano::Role.new
-      ret = sol.status( $cfg['location.base'] + $cfg['location.roles'], options)
+      ret = sol.status(options)
       gmerge(ret, 'R', options)
     end
 
     if options.users then
       sol = MrMurano::User.new
-      ret = sol.status( $cfg['location.base'] + $cfg['location.users'], options)
+      ret = sol.status(options)
       gmerge(ret, 'U', options)
     end
 
     if options.files then
       sol = MrMurano::File.new
-      ret = sol.status( $cfg['location.base'] + $cfg['location.files'], options)
+      ret = sol.status(options)
       gmerge(ret, 'S', options)
     end
 

data/lib/MrMurano/sync.rb

@@ -24,32 +24,32 @@ command :syncdown do |c|
     
     if options.endpoints then
       sol = MrMurano::Endpoint.new
-      sol.syncdown($cfg['location.base'] + $cfg['location.endpoints'], options)
+      sol.syncdown(options)
     end
 
     if options.modules then
       sol = MrMurano::Library.new
-      sol.syncdown( $cfg['location.base'] + $cfg['location.modules'], options)
+      sol.syncdown(options)
     end
 
     if options.eventhandlers then
       sol = MrMurano::EventHandler.new
-      sol.syncdown( $cfg['location.base'] + $cfg['location.eventhandlers'], options)
+      sol.syncdown(options)
     end
 
     if options.roles then
       sol = MrMurano::Role.new
-      sol.syncdown( $cfg['location.base'] + $cfg['location.roles'], options)
+      sol.syncdown(options)
     end
 
     if options.users then
       sol = MrMurano::User.new
-      sol.syncdown( $cfg['location.base'] + $cfg['location.users'], options)
+      sol.syncdown(options)
     end
 
     if options.files then
       sol = MrMurano::File.new
-      sol.syncdown( $cfg['location.base'] + $cfg['location.files'], options)
+      sol.syncdown(options)
     end
 
   end
@@ -81,32 +81,32 @@ command :syncup do |c|
 
     if options.endpoints then
       sol = MrMurano::Endpoint.new
-      sol.syncup($cfg['location.base'] + $cfg['location.endpoints'], options)
+      sol.syncup(options)
     end
 
     if options.modules then
       sol = MrMurano::Library.new
-      sol.syncup( $cfg['location.base'] + $cfg['location.modules'], options)
+      sol.syncup(options)
     end
 
     if options.eventhandlers then
       sol = MrMurano::EventHandler.new
-      sol.syncup( $cfg['location.base'] + $cfg['location.eventhandlers'], options)
+      sol.syncup(options)
     end
 
     if options.roles then
       sol = MrMurano::Role.new
-      sol.syncup( $cfg['location.base'] + $cfg['location.roles'], options)
+      sol.syncup(options)
     end
 
     if options.users then
       sol = MrMurano::User.new
-      sol.syncup( $cfg['location.base'] + $cfg['location.users'], options)
+      sol.syncup(options)
     end
 
     if options.files then
       sol = MrMurano::File.new
-      sol.syncup( $cfg['location.base'] + $cfg['location.files'], options)
+      sol.syncup(options)
     end
 
   end

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-	VERSION = '1.0.5'.freeze
+	VERSION = '1.1.0'.freeze
 end
 

metadata

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