MuranoCLI 2.1.1 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81958886e83634f8569dff4b70ecf0da208fb766
-  data.tar.gz: 87ff30809fa161c0bda2195d4126853ad2f2c4bf
+  metadata.gz: b78d9ce452b2b23947f59e64fc31dc8d9b8b577e
+  data.tar.gz: 87bc747d1e7e6cb6e053bfaa6880e81c537abf85
 SHA512:
-  metadata.gz: b87848e244f4b440ead85a6bed2b44bd50158006070896ab6aff25049b9815653ca5ace4140e7fff85aa8d9956cc680ac1657cee417990741c927c920c0551d6
-  data.tar.gz: b1e9d33bf529c1c95210057a559afeb6a9db98ac506eb4b43aab6bd8d1bf8ca43f3b606c8a901b1ac35b35ef2aa16b9532e9e44eddfa85dadb407e537b03d1b4
+  metadata.gz: 063e8c71e99d835b8432a9616d660a98dea0610e5d8e42f4903acf723b6115fc99c004afc9bf8476854f6d6b0c37b7c3ff6c95b09e48b2b62a56e45f6568867d
+  data.tar.gz: 9f380017ea3d6c31b411efe6a5cd55413cd3e9d3415a17131c99b231e872ca9189b7a3ebea04e0b598fecbdd3607b4bfaee1e465b03bffe0e63d4f7c877e4b2e

data/README.markdown

@@ -39,8 +39,8 @@ There are a few steps and pieces to getting a solution with a product up and
 running in Murano. Here is the list.
 
 - Pick a business: `murano business list`
-	If this is the first time you've run `murano` it will ask for your Murano username
-	and password.
+  If this is the first time you've run `murano` it will ask for your Murano username
+  and password.
 - Set it: `murano config business.id ZZZZZZZZZ`
 - Create a product: `murano product create myawesomeproduct --save`
 - Add resource aliases to specs/resources.yaml
@@ -58,24 +58,24 @@ Then deploy with `murano syncup`
 
 When upgrading from a 1.\* version to a 2.0, you should uninstall the old versions
 first.
-```
-> gem uninstall MuranoCLI
+```sh
+> gem uninstall MuranoCLI MrMurano
 ```
 
 And then install:
 
-```
+```sh
 > gem install MuranoCLI
 ```
 Or
-```
+```sh
 > gem update MuranoCLI
 ```
 
 You will likely need to be root for the above commands.  If you would rather not
 install as root, you can install gems in the user directory.
 
-```
+```sh
 > gem install MuranoCLI --user-install
 ```
 
@@ -128,12 +128,12 @@ CORS options inline.
 
 ```yaml
 routes:
-	cors: my_cors_file.json
+  cors: my_cors_file.json
 ```
 OR:
 ```yaml
 routes:
-	cors: {"origin": true}
+  cors: {"origin": true}
 ```
 
 Then use `murano cors set` to push these options up to your solution.
@@ -191,12 +191,12 @@ could be:
 --#EVENT device datapoint
 local stamped = nil
 if data.api == "record" then
-	stamped = tostring(data.value[1]) .. 's'
+  stamped = tostring(data.value[1]) .. 's'
 end
 Tsdb.write{
-	tags = {sn=data.device_sn},
-	metrics = {[data.alias] = tonumber(data.value[2])},
-	ts = stamped
+  tags = {sn=data.device_sn},
+  metrics = {[data.alias] = tonumber(data.value[2])},
+  ts = stamped
 }
 ```
 
@@ -211,7 +211,7 @@ and `.murano.prod`. Then write the `.env` file to point at the system you're
 currently working on.
 
 The files for this are then:
-```
+```sh
 cat >> .murano.dev <<EOF
 [solution]
 id=AAAAAAAA
@@ -295,9 +295,9 @@ the shell and are for testing the user facing components.  A subset of the comma
 tests work with the live Murano servers (`--tag needs_password`).
 
 To use the live tests, the following environment variables need to be set:
-- `MURANO_USER` : User name to log into Murano with
-- `MURANO_PASSWORD` : Password for that user
-- `MURANO_BUSINESS` : Business id to run tests within.
+- `MURANO_CONFIGFILE` : A Config with the user.name, business.id, and net.host for
+  the intergration tests.
+- `MURANO_PASSWORD` : Password for the user.name above.
 
 A free account on Murano is sufficient for these tests.
 

data/Rakefile

@@ -23,6 +23,20 @@ task :echo do
     puts builtGem
 end
 
+desc "display remind of how to release"
+task :release_reminder do
+    puts <<EOR
+git flow release start <newversion>
+gvim lib/MrMurano/version.rb
+git commit -a -m 'version bump'
+git flow release finish <newversion>
+# When editing message for tag, add release notes.
+rake git:all
+# Wait for all tests to complete.
+# if all passed: rake gemit
+EOR
+end
+
 desc "Prints a cmd to test this in another directory"
 task :testwith do
     pwd=Dir.pwd.sub(Dir.home, '~')
@@ -33,26 +47,24 @@ desc 'Run RSpec'
 task :rspec do
     Dir.mkdir("report") unless File.directory?("report")
     rv=RUBY_VERSION.gsub(/\./,'_')
-    sh %{rspec --format html --out report/index-#{rv}.html --format progress}
+    sh %{rspec --format html --out report/index-#{rv}.html --format documentation}
 end
 task :test => [:test_clean_up, :rspec]
 
 desc "Clean out junk from prior hot tests"
 task :test_clean_up do
-    if not ENV['MURANO_USER'].nil? and
-            not ENV['MURANO_BUSINESS'].nil? and
-            not ENV['MURANO_PASSWORD'].nil? then
+    if not ENV['MURANO_CONFIGFILE'].nil? then
 
-        ids = `ruby -Ilib bin/murano product list --idonly -c "user.name=#{ENV['MURANO_USER']}" -c net.host=bizapi.hosted.exosite.io -c business.id=#{ENV['MURANO_BUSINESS']}`.chomp
+        ids = `ruby -Ilib bin/murano product list --idonly`.chomp
         puts "Found prodcuts #{ids}; deleteing"
         ids.split.each do |id|
-            sh %{ruby -Ilib bin/murano product delete #{id} -c user.name=#{ENV['MURANO_USER']} -c net.host=bizapi.hosted.exosite.io -c business.id=#{ENV['MURANO_BUSINESS']}}
+            sh %{ruby -Ilib bin/murano product delete #{id}}
         end
 
-        ids = `ruby -Ilib bin/murano solution list --idonly -c user.name=#{ENV['MURANO_USER']} -c net.host=bizapi.hosted.exosite.io -c business.id=#{ENV['MURANO_BUSINESS']}`.chomp
+        ids = `ruby -Ilib bin/murano solution list --idonly`.chomp
         puts "Found solutions #{ids}; deleteing"
         ids.split.each do |id|
-            sh %{ruby -Ilib bin/murano solution delete #{id} -c user.name=#{ENV['MURANO_USER']} -c net.host=bizapi.hosted.exosite.io -c business.id=#{ENV['MURANO_BUSINESS']}}
+            sh %{ruby -Ilib bin/murano solution delete #{id}}
         end
     end
 end
@@ -153,7 +165,7 @@ if Gem.win_platform? then
     task :murano_exe_test => ['murano.exe'] do
         Dir.mkdir("report") unless File.directory?("report")
         ENV['CI_MR_EXE'] = '1'
-        sh %{rspec --format html --out report/murano_exe.html --format progress --tag cmd}
+        sh %{rspec --format html --out report/murano_exe.html --format documentation --tag cmd}
     end
     task :test => [:murano_exe_test]
 

data/TODO.taskpaper

@@ -3,6 +3,9 @@ Readme:
 	- Look into using VCR for testing. @pri(low)
 
 Commands:
+	- Add hooks. @done(2017-03-31)
+	- Add default options for commands. @done(2017-03-31)
+	So you can say to always -V syncup, and nothing else.
 	- Init command. @done(2016-11-28)
 	- Empty sub-commands should return help. @done(2016-11-21)
 	There are a bunch of empty sub-commands that prefix another layer. Such as
@@ -86,13 +89,12 @@ Config:
 	- Think about adding dev,staging,prod system; how would that work? @done(2016-09-16)
 
 SyncUpDown:
-	- Document the hash keys for an item. @pri(high)
+	- Document the hash keys for an item. @pri(high) @done(2017-03-30)
 	Also consider turning that hash into a Struct
 	- Allow specifying local files to limit actions to. @done(2017-03-03)
 
 SolutionBase:
-	- All network traffic is serialized. Make some parallel.
-	This might break some things.
+	- All network traffic is serialized. Make some parallel. not doing this. @done(2017-03-30)
 	- Errors from the server should be displayed prettier. @done(2016-09-26)
 	- JSON parse should use symbols for keys. @done(2016-09-01)
 	- Add the --curl verbose option. @done(2016-08-12)
@@ -103,8 +105,7 @@ Windows:
 	- Look into http://ocra.rubyforge.org for building an exec. @pri(high) @done(2016-12-21)
 
 Bundles:
-	- Revisit this idea. Its complexity may not be worth its value.
-	- Test syncdown behavor.
+	- Revisit this idea. Its complexity may not be worth its value. @done(2017-03-30)
 	- 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

data/bin/murano

@@ -52,8 +52,8 @@ $project.load
 
 # Basic command support is:
 # - read/write config file in [Project, User, System] (all are optional)
-# - Introspection for tab completion.
-# - Look for tools in PATH that are +x and "mr-foo..."
+# - TODO: Introspection for tab completion.
+# - TODO: Look for tools in PATH that are +x and "mr-foo..."
 
 
 # Look for plug-ins

data/lib/MrMurano/Account.rb

@@ -143,7 +143,7 @@ module MrMurano
     end
 
     def new_account(email, name, company="")
-      post('/key/', {
+      post('key/', {
         :email=>email,
         :name=>name,
         :company=>company,
@@ -152,11 +152,11 @@ module MrMurano
     end
 
     def reset_account(email)
-      post('/key/', { :email=>email, :source=>'reset' })
+      post('key/', { :email=>email, :source=>'reset' })
     end
 
     def accept_account(token, password)
-      post("/key/#{token}", {:password=>password})
+      post("key/#{token}", {:password=>password})
     end
 
     def businesses
@@ -165,11 +165,21 @@ module MrMurano
     end
 
     def new_business(name)
-      post('/business/', {:name=>name})
+      post('business/', {:name=>name})
     end
 
     def delete_business(id)
-      delete("/business/#{id}")
+      delete("business/#{id}")
+    end
+
+    def has_projects?(id)
+      ret = get("business/#{id}/overview")
+      return false unless ret.kind_of? Hash
+      return false unless ret.has_key? :tier
+      tier = ret[:tier]
+      return false unless tier.kind_of? Hash
+      return false unless tier.has_key? :enableProjects
+      return tier[:enableProjects]
     end
 
     def products

data/lib/MrMurano/ReCommander.rb

@@ -0,0 +1,52 @@
+
+module MrMurano
+  class Hooked
+    include Verbose
+    attr :section
+
+    def initialize(section)
+      @section = section
+    end
+
+    def check_run_pre_hook
+      prehook = $cfg["#{section}.pre-hook"]
+      return if prehook.nil?
+      return if prehook.empty?
+      verbose "calling pre-hook: #{prehook}"
+      system(prehook)
+    end
+
+    def check_run_post_hook
+      posthook = $cfg["#{section}.post-hook"]
+      return if posthook.nil?
+      return if posthook.empty?
+      verbose "calling post-hook: #{posthook}"
+      system(posthook)
+    end
+
+  end
+end
+
+module Commander
+  class Runner
+    alias :old_run_active_command :run_active_command
+    def run_active_command
+      section = active_command.name
+      hooked = MrMurano::Hooked.new(section)
+      hooked.check_run_pre_hook
+
+      old_run_active_command
+
+      hooked.check_run_post_hook
+    end
+
+    alias :old_parse_global_options :parse_global_options
+    def parse_global_options
+      defopts = ($cfg["#{active_command.name}.options"] or '').split
+      @args.push( *defopts )
+      old_parse_global_options
+    end
+  end
+end
+
+#  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/Solution-File.rb

@@ -93,7 +93,7 @@ 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.
 
-      file = HTTP::FormData::File.new(local.to_s, {:mime_type=>remote[:mime_type]})
+      file = HTTP::FormData::File.new(local.to_s, {:content_type=>remote[:mime_type]})
       form = HTTP::FormData.create(:file=>file)
       req = Net::HTTP::Put.new(uri)
       set_def_headers(req)

data/lib/MrMurano/commands/postgresql.rb

@@ -10,6 +10,10 @@ module MrMurano
     def query(query)
       call(:query, :post, {:sql=>query})
     end
+
+    def queries(query)
+      call(:queries, :post, {:sql=>query})
+    end
   end
 end
 
@@ -17,11 +21,23 @@ command :postgresql do |c|
   c.syntax = %{murano postgresql <SQL Commands>}
   c.summary = %{Query the relational database}
 
+  c.option '-f', '--file FILE', %{File of SQL commands}
   c.option '-o', '--output FILE', %{Download to file instead of STDOUT}
 
   c.action do |args,options|
     pg = MrMurano::Postgresql.new
-    ret = pg.query args.join(' ')
+    if options.file then
+      sqls = File.read(options.file)
+
+      ret = pg.queries sqls
+    else
+      ret = pg.query args.join(' ')
+    end
+
+    unless ret[:error].nil? then
+      pg.error "Returned error: #{ret[:error]}"
+      exit 1
+    end
 
     io=nil
     if options.output then
@@ -29,6 +45,7 @@ command :postgresql do |c|
     end
 
     pg.outf(ret, io) do |dd, ios|
+      dd = dd[:result]
       pg.tabularize({
         :headers=>dd[:columns],
         :rows=>dd[:rows]
@@ -38,4 +55,101 @@ command :postgresql do |c|
 
   end
 end
+
+command 'postgresql migrate' do |c|
+  c.syntax = %{murano postgresql migrate (up|down) <level>}
+  c.summary = %{Run database migration scripts.
+
+
+  The names of the script files must be in the "<level>-<name>-<up|down>.sql"
+  format.
+
+  The current version of the migrations (last <level> ran) will be stored in an
+  extra table in your database.  (__murano_cli_migrate__)
+
+  }
+
+  c.option '--dir DIR', %{Directory where migrations live}
+
+  c.action do |args,options|
+    options.default :dir => File.join($cfg['location.base'], 'sql-migrations')
+
+    direction = args.shift
+    if direction =~ /down/i then
+      direction = 'down'
+    else
+      direction = 'up'
+    end
+
+    want_version = args.first
+
+    pg = MrMurano::Postgresql.new
+
+    # get current version of DB.
+    ret = pg.queries %{
+    CREATE TABLE IF NOT EXISTS __murano_cli_migrate__ (version integer);
+    SELECT version FROM __murano_cli_migrate__;
+    }.gsub(/^\s+/,'')
+    unless ret[:error].nil? then
+      pp ret
+      exit 1
+    end
+    pg.debug "create/select: #{ret}"
+    current_version = (((((ret[:result] or []).last or {})[:rows] or []).first or []).first or 0).to_i
+
+    # Get migrations
+    migrations = Dir[File.join(options.dir, "*-#{direction}.sql")].sort
+    if migrations.empty? then
+      pg.error "No migrations to run."
+      exit 1
+    end
+    migrations.reverse! if direction == 'down'
+
+    if want_version.nil? then
+      want_version, _ = File.basename(migrations.last).split('-')
+    end
+    want_version = want_version.to_i
+    pg.verbose "Will migrate from version #{current_version} to #{want_version}"
+    if direction == 'down' then
+      if want_version >= current_version then
+        say "Nothing to do."
+        exit 0
+      end
+    else
+      if want_version <= current_version then
+        say "Nothing to do."
+        exit 0
+      end
+    end
+
+    # Select migrations between current and desired
+    migrations.select! do |m|
+      mvrs, _ = File.basename(m).split('-')
+      mvrs = mvrs.to_i
+      mvrs > current_version and mvrs <= want_version
+    end
+
+
+    # Run migrations.
+    migrations.each do |m|
+      mvrs, _ = File.basename(m).split('-')
+      pg.verbose "Running migration: #{File.basename(m)}"
+      unless $cfg['tool.dry'] then
+        pg.query 'BEGIN;'
+        ret = pg.queries File.read(m)
+        unless ret[:error].nil? then
+          pg.query 'ROLLBACK;'
+          pg.error "Migrations failed at level #{mvrs}"
+          pg.error "Because: #{ret[:error]}"
+          exit 5
+        else
+          pg.queries %{INSERT INTO __murano_cli_migrate__ values (#{mvrs});
+          DELETE FROM __murano_cli_migrate__ WHERE version <> #{mvrs};
+          COMMIT;}.gsub(/^\s+/,'')
+        end
+      end
+    end
+  end
+end
+
 #  vim: set ai et sw=2 ts=2 :

data/lib/MrMurano/commands/productDevice.rb

@@ -33,6 +33,7 @@ command 'product device read' do |c|
 
   end
 end
+alias_command 'device list', 'product device list'
 
 command 'product device twee' do |c|
   c.syntax = %{murano product device twee <identifier>}
@@ -64,6 +65,7 @@ command 'product device twee' do |c|
     io.close unless io.nil?
   end
 end
+alias_command 'device twee', 'product device twee'
 
 command 'product device delete' do |c|
   c.syntax = %{murano product device delete <identifier>}
@@ -77,6 +79,7 @@ command 'product device delete' do |c|
     prd.outf ret unless ret.empty?
   end
 end
+alias_command 'device delete', 'product device delete'
 
 # XXX cannot call this here, since 'sn list' doesn't exist yet.
 #alias_command 'product device list', 'sn list'

data/lib/MrMurano/commands/productDeviceIdCmds.rb

@@ -25,6 +25,7 @@ command 'product device list' do |c|
     io.close unless io.nil?
   end
 end
+alias_command 'device list', 'product device list'
 
 command 'product device enable' do |c|
   c.syntax = %{murano product device enable [<sn>|--file <sns>]}
@@ -52,6 +53,7 @@ the activation call within this time, it will need to be enabled again.
     end
   end
 end
+alias_command 'device enable', 'product device enable'
 
 command 'product device activate' do |c|
   c.syntax = %{murano product device activate <sn>}
@@ -78,6 +80,7 @@ CIK again.
 
   end
 end
+alias_command 'device activate', 'product device activate'
 
 alias_command 'sn list', 'product device list'
 alias_command 'sn enable', 'product device enable'

data/lib/MrMurano/http.rb

@@ -7,7 +7,8 @@ module MrMurano
   module Http
     def token
       return @token unless @token.nil?
-      @token = Account.new.token
+      acc = Account.new
+      @token = acc.token
       raise "Not logged in!" if @token.nil?
       @token
     end
@@ -108,6 +109,12 @@ module MrMurano
           end
         else
           showHttpError(request, response)
+          return {} if response.body.nil?
+          begin
+            return JSON.parse(response.body, json_opts)
+          rescue
+            return response.body
+          end
         end
       end
     end

data/lib/MrMurano/version.rb

@@ -1,4 +1,4 @@
 module MrMurano
-  VERSION = '2.1.1'.freeze
+  VERSION = '2.2.1'.freeze
 end
 

data/lib/MrMurano.rb

@@ -17,4 +17,5 @@ require 'MrMurano/Product'
 require 'MrMurano/Product-1P-Device'
 require 'MrMurano/Product-Resources'
 
+require 'MrMurano/ReCommander'
 require 'MrMurano/commands'

data/spec/Http_spec.rb

@@ -191,7 +191,7 @@ RSpec.describe MrMurano::Http do
       idhttp = instance_double('Net::HTTP')
       expect(idhttp).to receive(:request).once.and_return(@rsp)
       expect(@tst).to receive(:http).once.and_return(idhttp)
-      expect(@rsp).to receive(:body).and_return(%{{"statusCode": 123, "message": "gone"}})
+      expect(@rsp).to receive(:body).exactly(3).times.and_return(%{{"statusCode": 123, "message": "gone"}})
 
       @tst.workit(@req)
       expect($stdout.string).to eq('')

data/spec/cmd_common.rb

@@ -45,18 +45,6 @@ RSpec.shared_context "CI_CMD" do
       ENV['HOME'] = hdir
       Dir.chdir(hdir) do
         Dir.mkdir('.murano')
-        unless ENV['MURANO_USER'].nil? then
-          File.open(File.join('.murano', 'config'), 'a') do |io|
-            io << "[user]\n"
-            io << "name = #{ENV['MURANO_USER']}\n"
-          end
-        end
-        unless ENV['MURANO_BUSINESS'].nil? then
-          File.open(File.join('.murano', 'config'), 'a') do |io|
-            io << "[business]\n"
-            io << "id = #{ENV['MURANO_BUSINESS']}\n"
-          end
-        end
         @tmpdir = File.join(hdir, 'project')
         Dir.mkdir(@tmpdir)
         Dir.chdir(@tmpdir) do

data/spec/cmd_help_spec.rb

@@ -0,0 +1,25 @@
+require 'fileutils'
+require 'open3'
+require 'pathname'
+require 'cmd_common'
+
+RSpec.describe 'murano help', :cmd do
+  include_context "CI_CMD"
+
+  it "no args" do
+    out, err, status = Open3.capture3(capcmd('murano'))
+    expect(err).to eq('')
+    expect(out).to_not eq('')
+    expect(status.exitstatus).to eq(0)
+  end
+
+  it "as --help" do
+    out, err, status = Open3.capture3(capcmd('murano', '--help'))
+    expect(err).to eq('')
+    expect(out).to_not eq('')
+    expect(status.exitstatus).to eq(0)
+  end
+
+end
+
+#  vim: set ai et sw=2 ts=2 :

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.1
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -268,6 +268,7 @@ files:
 - lib/MrMurano/Product-Resources.rb
 - lib/MrMurano/Product.rb
 - lib/MrMurano/ProjectFile.rb
+- lib/MrMurano/ReCommander.rb
 - lib/MrMurano/Solution-Cors.rb
 - lib/MrMurano/Solution-Endpoint.rb
 - lib/MrMurano/Solution-File.rb
@@ -357,6 +358,7 @@ files:
 - spec/cmd_cors_spec.rb
 - spec/cmd_device_spec.rb
 - spec/cmd_domain_spec.rb
+- spec/cmd_help_spec.rb
 - spec/cmd_init_spec.rb
 - spec/cmd_keystore_spec.rb
 - spec/cmd_password_spec.rb
@@ -457,6 +459,7 @@ test_files:
 - spec/cmd_cors_spec.rb
 - spec/cmd_device_spec.rb
 - spec/cmd_domain_spec.rb
+- spec/cmd_help_spec.rb
 - spec/cmd_init_spec.rb
 - spec/cmd_keystore_spec.rb
 - spec/cmd_password_spec.rb