citysdk 1.0.6 → 1.0.8

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 61324cf4f66dd18c97c21ee8560010955dffee0c
4
- data.tar.gz: 7d2b13d3633bfc7b19af4d11f10cfe7137939453
3
+ metadata.gz: f04e48fc30914341866e7bdb4f4de4a452438c28
4
+ data.tar.gz: 0c2a9bcf9cae2153ea73604f7e9967ca2039935a
5
5
  SHA512:
6
- metadata.gz: d3db43533c16fbbce2f536b1f97e0ad32e19b793fc7ad95ec5ffef4b783d93c9700d7a8555d4b39e292d806dfd1871e1e0374ae6ab2f20d05c8a648d8953b1d1
7
- data.tar.gz: 2e8c4008387d537184bebf6942632a39d4fdaa6e3d1c41eaa3716de7fd3a4b9b7154426973d71ab28ad878e18e71dd73d7b4207f39a76f93709daeffadf155d9
6
+ metadata.gz: af1821e45d0635e1a58d16d0e9d835053180095880a0e50e9989d5ad537769e327a3d2351f82341a5741aaed4d2727fe691e5883accba5b06fc15b795ffce6b2
7
+ data.tar.gz: 1474d93a11185b21a4f5226b912feff325895364d7441032f4104e8c81587e1d03d2af90ddbe9dcab1732f88a824a55dc3c01c868dda7364a2a7bb53fb0ceaf6
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- citysdk (1.0.6)
4
+ citysdk (1.0.7)
5
5
  charlock_holmes (~> 0.6)
6
6
  curses (~> 1.0)
7
7
  dbf (~> 2.0)
data/bin/citysdk-cli CHANGED
@@ -195,6 +195,7 @@ def createLayer
195
195
  json = ''
196
196
  if $api.authenticate($credentials_hash[:login],$credentials_hash[:password])
197
197
  begin
198
+ jsonlog(layer)
198
199
  json = $api.post "/layers", layer
199
200
  getLayersList
200
201
  $layer = $layers.select { |i| (i[:name] == layer[:name]) }[0]
@@ -478,29 +479,6 @@ def showUsers
478
479
  $outwin.refresh
479
480
  end
480
481
 
481
-
482
-
483
- def deleteUser(u)
484
- return unless ($user and $user[:admin])
485
- user = selectUser("user to delete")
486
- return if user.nil?
487
- if (u[:name] =~ /citysdk/i)
488
- return sherror("User 'citysdk' cannot be deleted.")
489
- end
490
- if yesNo?("Are you sure; deleting user #{u[:name]}?",1)
491
- apiCall('deleting user',"User #{u[:name]} is deleted.") do
492
- json = ''
493
- if $api.authenticate($credentials_hash[:login],$credentials_hash[:password])
494
- json = $api.delete "/owners/#{u[:name]}"
495
- $api.release
496
- getUserList
497
- end
498
- json
499
- end
500
- end
501
- end
502
-
503
-
504
482
  def createUser
505
483
  if $user and $user[:admin]
506
484
  user = {}
@@ -521,7 +499,8 @@ def createUser
521
499
  return cancelled unless get_input("password",:password,user,10)
522
500
 
523
501
  user[:admin] = isTrue?(user[:admin])
524
- user[:domains] = user[:domains].split(",").map {|d| d.strip }.join(",")
502
+ user[:domains] = user[:domains].split(",").map {|d| d.strip }.join(",")
503
+ user[:domains] = "{" + user[:domains] + "}"
525
504
 
526
505
  apiCall('add new user') do
527
506
  json = ''
@@ -541,7 +520,7 @@ end
541
520
 
542
521
 
543
522
  def selectUser(prompt)
544
- return $user unless $user[:admin]
523
+ return nil unless $user[:admin]
545
524
  n = get_input_from_list(prompt, $users.map {|u| u[:name]}, 1)
546
525
  l = $users.select { |i| (i[:name] == n) }
547
526
  if l.blank?
@@ -551,6 +530,25 @@ def selectUser(prompt)
551
530
  l[0]
552
531
  end
553
532
 
533
+ def deleteUser()
534
+ return unless ($user and $user[:admin])
535
+ user = selectUser("user to delete")
536
+ return if user.nil?
537
+ if (user[:name] =~ /citysdk/i)
538
+ return sherror("User 'citysdk' cannot be deleted.")
539
+ end
540
+ if yesNo?("Are you sure; deleting user #{user[:name]}?",1)
541
+ apiCall('deleting user',"User #{user[:name]} is deleted.") do
542
+ json = ''
543
+ if $api.authenticate($credentials_hash[:login],$credentials_hash[:password])
544
+ json = $api.delete "/owners/#{user[:name]}"
545
+ $api.release
546
+ getUserList
547
+ end
548
+ json
549
+ end
550
+ end
551
+ end
554
552
 
555
553
 
556
554
  def editUser
data/lib/citysdk.rb CHANGED
@@ -4,5 +4,5 @@ require_relative './citysdk/file_reader.rb'
4
4
  require_relative './citysdk/importer.rb'
5
5
 
6
6
  module CitySDK
7
- VERSION = '1.0.6'
7
+ VERSION = '1.0.8'
8
8
  end
@@ -12,7 +12,7 @@ module CitySDK
12
12
  raise Exception.new("Missing :file_path in Importer parameters.") if @params[:file_path].nil?
13
13
 
14
14
  @api = CitySDK::API.new(@params[:host])
15
- if @params[:name]
15
+ if @params[:login]
16
16
  raise Exception.new("Missing :password in Importer parameters.") if @params[:password].nil?
17
17
  raise Exception.new("Failure to authenticate '#{@params[:name]}' with api.") if not @api.authenticate(@params[:name],@params[:password])
18
18
  @api.release
@@ -43,7 +43,7 @@ module CitySDK
43
43
  sign_out if @signed_in
44
44
  @api.set_host(@params[:host])
45
45
  @api.set_layer(@params[:layer])
46
- @api.authenticate(@params[:name],@params[:password])
46
+ @api.authenticate(@params[:login],@params[:password])
47
47
  @signed_in = true
48
48
  rescue => e
49
49
  @api.release
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: citysdk
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.6
4
+ version: 1.0.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tom Demeyer
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-24 00:00:00.000000000 Z
11
+ date: 2016-04-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: i18n