citysdk 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61324cf4f66dd18c97c21ee8560010955dffee0c
-  data.tar.gz: 7d2b13d3633bfc7b19af4d11f10cfe7137939453
+  metadata.gz: f04e48fc30914341866e7bdb4f4de4a452438c28
+  data.tar.gz: 0c2a9bcf9cae2153ea73604f7e9967ca2039935a
 SHA512:
-  metadata.gz: d3db43533c16fbbce2f536b1f97e0ad32e19b793fc7ad95ec5ffef4b783d93c9700d7a8555d4b39e292d806dfd1871e1e0374ae6ab2f20d05c8a648d8953b1d1
-  data.tar.gz: 2e8c4008387d537184bebf6942632a39d4fdaa6e3d1c41eaa3716de7fd3a4b9b7154426973d71ab28ad878e18e71dd73d7b4207f39a76f93709daeffadf155d9
+  metadata.gz: af1821e45d0635e1a58d16d0e9d835053180095880a0e50e9989d5ad537769e327a3d2351f82341a5741aaed4d2727fe691e5883accba5b06fc15b795ffce6b2
+  data.tar.gz: 1474d93a11185b21a4f5226b912feff325895364d7441032f4104e8c81587e1d03d2af90ddbe9dcab1732f88a824a55dc3c01c868dda7364a2a7bb53fb0ceaf6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    citysdk (1.0.6)
+    citysdk (1.0.7)
       charlock_holmes (~> 0.6)
       curses (~> 1.0)
       dbf (~> 2.0)

data/bin/citysdk-cli

@@ -195,6 +195,7 @@ def createLayer
       json = ''
       if $api.authenticate($credentials_hash[:login],$credentials_hash[:password])
         begin
+          jsonlog(layer)
           json = $api.post "/layers", layer
           getLayersList
           $layer = $layers.select { |i| (i[:name] == layer[:name]) }[0]
@@ -478,29 +479,6 @@ def showUsers
   $outwin.refresh
 end
 
-
-
-def deleteUser(u)
-  return unless ($user and $user[:admin])
-  user = selectUser("user to delete")
-  return if user.nil?
-  if (u[:name] =~ /citysdk/i)
-    return sherror("User 'citysdk' cannot be deleted.")
-  end
-  if yesNo?("Are you sure; deleting user #{u[:name]}?",1)
-    apiCall('deleting user',"User #{u[:name]} is deleted.") do 
-      json = ''
-      if $api.authenticate($credentials_hash[:login],$credentials_hash[:password])
-        json = $api.delete "/owners/#{u[:name]}"
-        $api.release
-        getUserList
-      end
-      json
-    end
-  end
-end
-
-
 def createUser
   if $user and $user[:admin]
     user = {}
@@ -521,7 +499,8 @@ def createUser
     return cancelled unless get_input("password",:password,user,10)
 
     user[:admin]   = isTrue?(user[:admin]) 
-    user[:domains] = user[:domains].split(",").map {|d| d.strip }.join(",")
+    user[:domains] = user[:domains].split(",").map {|d|  d.strip }.join(",")
+    user[:domains] = "{" + user[:domains] + "}"
     
     apiCall('add new user') do 
       json = ''
@@ -541,7 +520,7 @@ end
 
 
 def selectUser(prompt)
-  return $user unless $user[:admin]  
+  return nil unless $user[:admin]  
   n = get_input_from_list(prompt, $users.map {|u| u[:name]}, 1)
   l = $users.select { |i| (i[:name] == n) }
   if l.blank?
@@ -551,6 +530,25 @@ def selectUser(prompt)
   l[0]
 end
 
+def deleteUser()
+  return unless ($user and $user[:admin])
+  user = selectUser("user to delete")
+  return if user.nil?
+  if (user[:name] =~ /citysdk/i)
+    return sherror("User 'citysdk' cannot be deleted.")
+  end
+  if yesNo?("Are you sure; deleting user #{user[:name]}?",1)
+    apiCall('deleting user',"User #{user[:name]} is deleted.") do 
+      json = ''
+      if $api.authenticate($credentials_hash[:login],$credentials_hash[:password])
+        json = $api.delete "/owners/#{user[:name]}"
+        $api.release
+        getUserList
+      end
+      json
+    end
+  end
+end
 
 
 def editUser

data/lib/citysdk.rb

@@ -4,5 +4,5 @@ require_relative './citysdk/file_reader.rb'
 require_relative './citysdk/importer.rb'
 
 module CitySDK
-  VERSION = '1.0.6'
+  VERSION = '1.0.8'
 end

data/lib/citysdk/importer.rb

@@ -12,7 +12,7 @@ module CitySDK
       raise Exception.new("Missing :file_path in Importer parameters.") if @params[:file_path].nil?
 
       @api = CitySDK::API.new(@params[:host])
-      if @params[:name]
+      if @params[:login]
         raise Exception.new("Missing :password in Importer parameters.") if @params[:password].nil?
         raise Exception.new("Failure to authenticate '#{@params[:name]}' with api.") if not @api.authenticate(@params[:name],@params[:password])
         @api.release
@@ -43,7 +43,7 @@ module CitySDK
         sign_out if @signed_in
         @api.set_host(@params[:host])
         @api.set_layer(@params[:layer])
-        @api.authenticate(@params[:name],@params[:password])
+        @api.authenticate(@params[:login],@params[:password])
         @signed_in = true
       rescue => e
         @api.release

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: citysdk
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Tom Demeyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n