citysdk 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78ef0e0bcb5fdbdd87c1bf7ed8f6c5340116230f
-  data.tar.gz: 9be45547c69459d2e72f622ef99c698f7d8a015f
+  metadata.gz: 61324cf4f66dd18c97c21ee8560010955dffee0c
+  data.tar.gz: 7d2b13d3633bfc7b19af4d11f10cfe7137939453
 SHA512:
-  metadata.gz: 093707eeec263bd2563a6a0d1662721f49ea1f187db4bb2f7a7fbb046cbbea92c466fcd55517e2ed937444ee3effe6ef307dd020d412bf2fc25f6024487af663
-  data.tar.gz: 353f25ccaa3ca222ad29468e34e873e5c6efda888c4788a9583522002255370d8f2203067b8e52906746f9f36cec8cb9133e13446a61e8a8366a41e2d0a6d8c3
+  metadata.gz: d3db43533c16fbbce2f536b1f97e0ad32e19b793fc7ad95ec5ffef4b783d93c9700d7a8555d4b39e292d806dfd1871e1e0374ae6ab2f20d05c8a648d8953b1d1
+  data.tar.gz: 2e8c4008387d537184bebf6942632a39d4fdaa6e3d1c41eaa3716de7fd3a4b9b7154426973d71ab28ad878e18e71dd73d7b4207f39a76f93709daeffadf155d9

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    citysdk (1.0.3)
+    citysdk (1.0.6)
       charlock_holmes (~> 0.6)
       curses (~> 1.0)
       dbf (~> 2.0)
       faraday (~> 0.8)
       georuby (~> 2.0)
+      i18n (~> 0.7)
 
 GEM
   remote: https://rubygems.org/
@@ -16,24 +17,24 @@ GEM
     dbf (2.0.7)
       fastercsv (~> 1.5.4)
     diff-lcs (1.2.5)
-    faraday (0.9.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     fastercsv (1.5.5)
-    georuby (2.2.1)
-    i18n (0.6.11)
+    georuby (2.5.1)
+    i18n (0.7.0)
     multipart-post (2.0.0)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.2)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
 
 PLATFORMS
   ruby
@@ -43,5 +44,4 @@ DEPENDENCIES
   citysdk!
   faraday
   georuby
-  i18n (~> 0.6.9)
   rspec (~> 3.0)

data/bin/citysdk-cli

@@ -126,7 +126,7 @@ end
 def createLayer
   return unless $user
   
-  userdomains = $user[:domains].split(",")
+  userdomains = $user[:domains] ? $user[:domains].split(",") : []
   userdomains << 'test'
   userdomains = userdomains.map{|d|d.strip}.uniq
   layer = {}
@@ -269,8 +269,8 @@ def doImport
   
   return unless $user
   
-  if $file_hash[:layername].blank?
-    $file_hash[:layername] = $layer = selectNewOrExistingLayer 
+  if $file_hash[:layer].blank?
+    $file_hash[:layer] = $layer = selectNewOrExistingLayer 
     return unless $layer
   end
 
@@ -299,16 +299,16 @@ def doImport
     n = $file_reader.content.length
     i = 0
     begin
-      $file_hash[:layername] = $layer[:name]
+      $file_hash[:layer] = $layer[:name]
       imp = Importer.new($file_hash, $file_reader)
       imp.api.batch_size = $file_hash[:batch_size].to_i
-      n = imp.doImport do |d|
+      n = imp.do_import do |d|
         i += 1
         outAddstr 1,"importing: #{Integer(100 * i / n)}%" if(i % 100)
       end
       outMessage("Import of #{$file_hash[:file_path]} succesful; processed #{n[:created]} items.")
     rescue Exception => e
-      $file_hash[:layername] = nil
+      $file_hash[:layer] = nil
       sherror(e.message)
       return
     end
@@ -442,7 +442,7 @@ def showLayers
   i = 1
   $layers.each do |u|
     s =  sprintf("%-15s ",u[:name])
-    s += sprintf("#{u[:category]}/#{u[:subcategory]}, #{u[:owner][:fullname]}, #{u[:description]}")
+    s += sprintf("#{u[:category]}/#{u[:subcategory]}, #{u[:owner]}, #{u[:description]}")
     $outwin.setpos(i,0)
     $outwin.addstr s.remove_non_ascii
     i += 1
@@ -457,7 +457,7 @@ def getUserList
   $users = []
   begin
     $api.authenticate($credentials_hash[:login],$credentials_hash[:password]) if $user
-    $users = $api.get('/owners?per_page=1000')
+    $users = $api.get('/owners?per_page=1000')[:owners]
     $api.release if $user
   rescue Exception => e
     sherror("getUserList: " + e.message)
@@ -744,7 +744,7 @@ def loadFile
     $file_hash = $file_hash.merge $credentials_hash.dup
     $file_hash[:file_path] = File.expand_path($file_hash[:file_path])
     $file_reader = FileReader.new($file_hash)
-    $file_hash[:layername] = $layer[:name] if $layer
+    $file_hash[:layer] = $layer[:name] if $layer
     fileSummary(0)
     $outwin.refresh
   rescue => e
@@ -873,6 +873,7 @@ end
 def doConnect
   begin
     if $api.nil?
+      log $credentials_hash
       return if ($credentials_hash[:host].nil? or $credentials_hash[:host]=~/^\s*$/)
       $api = API.new($credentials_hash[:host])
     end

data/lib/citysdk.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: citysdk
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Tom Demeyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -172,3 +172,4 @@ test_files:
 - spec/files/stations.json
 - spec/files/wkb.csv
 - spec/import_spec.rb
+has_rdoc: