zendesk-populator 0.0.2 → 0.0.3

data/bin/zdpop

@@ -60,7 +60,7 @@ end
 
 begin
   optparse.parse!
-  Zdpop::Populator.new(options[:cfile],options[:dfile])
+  Zdpop::Populator.new(options)
 rescue OptionParser::InvalidArgument, OptionParser::InvalidOption, OptionParser::MissingArgument
   puts $!.to_s
   puts optparse

data/lib/zdpop/populator.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'csv'
+require 'uri'
 
 begin
   require 'httparty'
@@ -10,12 +11,16 @@ end
 module Zdpop
   class Populator
 
-    def initialize(configfile,datafile)
+    def initialize(options)
       begin
+        # Process options
+        configfile = options[:cfile]
+        datafile = options[:dfile]
+
         # Set configuration
         raise "Configuration file #{configfile} missing" unless File.file? configfile
         config = YAML.load_file(configfile)
-        @site = config[:zendesk_site]
+        @site = valid_site(config[:zendesk_site])
         @user = config[:zendesk_user]
         @password = config[:zendesk_password]
         raise "Missing Zendesk site, user or password" if [ @site, @user, @password ].include?(nil)
@@ -49,8 +54,7 @@ module Zdpop
 
     def list_orgs
       orglist = []
-      organizations = HTTParty.get("#{@site}api/v1/organizations.json", :basic_auth => {:username=>"#{@user}", :password=> "#{@password}" } )
-
+      organizations = get_orgs
       organizations.each { |o|
           orglist << o["name"]
       }
@@ -59,7 +63,7 @@ module Zdpop
 
     def lookup_org_id(org)
       orgtable = {}
-      organizations = HTTParty.get("#{@site}api/v1/organizations.json", :basic_auth => {:username=>"#{@user}", :password=> "#{@password}" } )
+      organizations = get_orgs
       organizations.each { |o|
         orgtable["#{o["name"]}"] = o["id"]
       }
@@ -67,9 +71,13 @@ module Zdpop
       return id
     end
 
+    def get_orgs
+      HTTParty.get("#{@site}/api/v1/organizations.json", :basic_auth => {:username=>"#{@user}", :password=> "#{@password}" } )
+    end
+
     def list_users
       userlist = []
-      users = HTTParty.get("#{@site}users.json", :basic_auth => {:username=>"#{@user}", :password=> "#{@password}" } )
+      users = HTTParty.get("#{@site}/users.json", :basic_auth => {:username=>"#{@user}", :password=> "#{@password}" } )
       users.each { |u|
         userlist << u["name"]
       }
@@ -78,7 +86,7 @@ module Zdpop
 
     def create_org(org,domain)
       payload = { :organization => { :name => org, :is_shared => 'true', :is_shared_comments => 'true', :default => domain } }
-      response = HTTParty.post("#{@site}api/v1/organizations.json", :basic_auth => {:username=>"#{@user}", :password=> "#{@password}" }, :body => payload )
+      response = HTTParty.post("#{@site}/api/v1/organizations.json", :basic_auth => {:username=>"#{@user}", :password=> "#{@password}" }, :body => payload )
       if response.code == 201
         puts "Created organization #{org}"
       else
@@ -89,12 +97,24 @@ module Zdpop
     def create_user(name,email,org)
       id = lookup_org_id(org)
       payload = { :user => { :name => name, :email => email, :roles => '0', :restriction_id => '2', :organization_id => id } }
-      response = HTTParty.post("#{@site}users.json", :basic_auth => {:username=>"#{@user}", :password=> "#{@password}" }, :body => payload )
+      response = HTTParty.post("#{@site}/users.json", :basic_auth => {:username=>"#{@user}", :password=> "#{@password}" }, :body => payload )
       if response.code == 200
         puts "Created user #{name}"
       else
         puts "Response code: #{response.code} - #{response.body}"
       end
     end
+
+    def valid_site(site)
+      begin
+        uri = URI.parse(site.gsub(/\/*$/,''))
+        if uri.class != URI::HTTPS
+          puts "Only HTTPS protocol addresses can be used"
+        end
+        return uri
+      rescue URI::InvalidURIError
+        puts "The site: #{site} is not a valid URL"
+      end
+    end
   end
 end

data/lib/zdpop/version.rb

@@ -1,5 +1,5 @@
 module Zdpop
   module Version
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zendesk-populator
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - James Turnbull
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-14 00:00:00 +10:00
-default_executable: zdpop
+date: 2012-02-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -48,7 +47,6 @@ files:
 - bin/zdpop
 - lib/zdpop/populator.rb
 - lib/zdpop/version.rb
-has_rdoc: true
 homepage: http://github.com/jamtur01/zendesk-populator/
 licenses: 
 - APL2
@@ -78,9 +76,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A command line tool to generate Zendesk orgs and users from CSV.
 test_files: []
 
+has_rdoc: