MuranoCLI 3.0.8 → 3.1.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3724b5391071776bfe44190b14ad244788ff94b7
-  data.tar.gz: f7a7825838b2143194871519fd109b00701ac361
+  metadata.gz: 8f37048d0f8e9d3ee210166e7f27240e01a465fb
+  data.tar.gz: 635efd3ce5432c2d7737464c4bd1c7cef8a3e3de
 SHA512:
-  metadata.gz: e92ac9179d3a3444d9a8a283ab94f85e576d88e5bcae6f7b947d2401b588bb8fd4ca67cd7d31817a7cdadec1488aefc6ae0b966afe45aaba944a611571f8b8d2
-  data.tar.gz: 9fba7a0956161da7105417580bd9aa79c0372b61e3883318a184dd8a17ea01aeafc4e9c2f89e299cc4cf1f68b9c92ca89c1fd8013380a458a9e9c45dd1ee92bd
+  metadata.gz: 06aa8d4b6de186aeb2de85d7a68a42d733971b56db0153356c1d4b681c0bdb78708549d267db31317b20e968c6b5b6b92f9629bc66c88180852c415cb3da538b
+  data.tar.gz: ae8101e79d98a35c398461b7c8e0f9809c6af891e2d1181e0136b43bf54e48cb7ef0c7d62e4feb3e4b863608768b7d2391d97e2557c6f685d5276c5cf320ac9c

data/lib/MrMurano/Logs.rb

@@ -14,6 +14,11 @@ require 'MrMurano/verbosing'
 module MrMurano
   module Logs
     class Follow
+      def initialize(query, limit=nil)
+        @query = query
+        @limit = limit
+      end
+
       def run_event_loop(sol, &block)
         # block_given?
         @message_handler = block
@@ -30,13 +35,16 @@ module MrMurano
         # FIXME/2017-12-12 (landonb): Which endpoint do we want?
         #   /events, or /all, or /logs??
         uri = [
-          protocol + ':/', $cfg['net.host'], 'api:1', 'log', sol.api_id, 'logs',
+          protocol + ':/', $cfg['net.host'], 'api:1', 'solution', sol.api_id, 'logs',
         ].join('/')
         uri += %(?token=#{sol.token})
-        uri += %(&query={})
-        uri += %(&projection={})
-        # FIXME: (landonb): Would we want to add limit=?
-        #uri += %(&limit=20)
+        uri += %(&query=#{@query}) unless @query.to_s.empty?
+        uri += %(&limit=#{@limit}) unless @limit.nil?
+        # MAYBE: (landonb): Add projection options? (Use for tracking exclusion.)
+        #   uri += %(&projection={})
+        # MAYBE: (landonb): Add limit option? This is number
+        #  of old log events to fetch first before streaming.
+        #   uri += %(&limit=20)
         uri
       end
 

data/lib/MrMurano/ProjectFile.rb

@@ -120,7 +120,7 @@ module MrMurano
     end
 
     def new_meta
-      tname = $cfg['location.base'].basename.to_s.gsub(/[^A-Za-z0-9]/, '')
+      tname = Pathname.new($cfg['location.base']).basename.to_s.gsub(/[^A-Za-z0-9]/, '')
       PrjMeta.new(
         tname,
         "One line summary of #{tname}",
@@ -137,7 +137,7 @@ module MrMurano
     end
 
     # Get the current Project file
-    # @return [Pathname] PAth to current project file.
+    # @return [Pathname] Path to current project file.
     def project_file
       @prj_file
     end
@@ -174,6 +174,9 @@ module MrMurano
         'assets.include' => 'files.searchFor',
         'assets.exclude' => 'files.ignoring',
 
+        # (lb): As far as I can tell, code uses $cfg['files.default_page'],
+        #       and never accesses the $project['assets.default_page'].
+        #       Is this a bug?
         'assets.default_page' => 'files.default_page',
 
         'modules.location' => 'location.modules',
@@ -191,8 +194,6 @@ module MrMurano
         'services.exclude' => 'eventhandler.ignoring',
 
         'resources.location' => 'location.resources',
-        # EXPLAIN/2017-07-05: [lb] not finding either resources.include
-        # nor product.spec used anywhere.
         'resources.include' => 'product.spec',
         'resources.exclude' => 'product.ignoring',
       }.freeze

data/lib/MrMurano/SyncUpDown.rb

@@ -202,63 +202,17 @@ module MrMurano
     # @param local [Pathname] Full path of where to download to
     # @param item [Item] The item to download
     def update_mtime(local, item)
-      # FIXME/MUR-XXXX: Ideally, server should use a hash we can compare.
-      #   For now, we use the sometimes set :updated_at value.
-      # FIXME/EXPLAIN/2017-06-23: Why is :updated_at sometimes not set?
-      #   (See more comments, below.)
       return unless item[:updated_at]
-
       mod_time = item[:updated_at]
       mod_time = Time.parse(mod_time) unless mod_time.is_a?(Time)
       begin
         FileUtils.touch([local.to_path], mtime: mod_time)
       rescue Errno::EACCES => err
-        # This happens on Windows...
-        require 'rbconfig'
-        # Check the platform, e.g., "linux-gnu", or other.
-        #is_windows = (
-        #  RbConfig::CONFIG['host_os'] =~ /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-        #)
+        # (lb): This is okay on Windows. (We really need a better solution.)
         unless OS.windows?
           msg = 'Unexpected: touch failed on non-Windows machine'
           warn "#{msg} / host_os: #{RbConfig::CONFIG['host_os']} / err: #{err}"
         end
-
-        # 2017-07-13: Nor does ctime work.
-        #   Errno::EACCES:
-        #   Permission denied @ utime_failed -
-        #     C:/Users/ADMINI~1/AppData/Local/Temp/2/one.lua_remote_20170714-1856-by2nzk.lua
-        #File.utime(mod_time, mod_time, local.to_path)
-
-        # 2017-07-14: So this probably fails, too...
-        #FileUtils.touch [local.to_path,], :ctime => mod_time
-
-        # MAYBE/2017-07-14: How to make diff work on Windows?
-        #   Would need to store timestamp in metafile?
-
-        # FIXME/EXPLAIN/2017-06-23: Why is :updated_at sometimes not set?
-        #     And why have I only triggered this from ./spec/cmd_syncdown_spec.rb ?
-        #       (Probably because nothing else makes routes or files?)
-        #     Here are the items in question:
-        #
-        # Happens to each of the MrMurano::Webservice::Endpoint::RouteItem's:
-        #
-        # <MrMurano::Webservice::Endpoint::RouteItem:0x007fe719cb6300
-        #   @id="QeRq21Cfij",
-        #   @method="delete",
-        #   @path="/api/fire/{code}",
-        #   @content_type="application/json",
-        #   @script="--#ENDPOINT delete /api/fire/{code}\nreturn 'ok'\n\n-- vim: set ai sw=2 ts=2 :\n",
-        #   @use_basic_auth=false,
-        #   @synckey="DELETE_/api/fire/{code}">
-        #
-        # Happens to each of the MrMurano::Webservice::File::FileItem's:
-        #
-        # <MrMurano::Webservice::File::FileItem:0x007fe71a44a8f0
-        #   @path="/",
-        #   @mime_type="text/html",
-        #   @checksum="da39a3ee5e6b4b0d3255bfef95601890afd80709",
-        #   @synckey="/">
       end
     end
 

data/lib/MrMurano/commands/globals.rb

@@ -92,3 +92,4 @@ global_option('--sid VALUE', %(Override application or product ID)) do |value|
   $cfg['application.id'] = value
   $cfg['product.id'] = value
 end
+