zenpush 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zenpush (0.1.0)
+    zenpush (0.1.1)
       awesome_print (~> 1.0.0)
       boson (~> 1.0)
       httparty (~> 0.8.0)
@@ -18,7 +18,7 @@ GEM
       multi_xml
     json_pure (1.5.4)
       spruz (~> 0.2.8)
-    multi_json (1.1.0)
+    multi_json (1.4.0)
     multi_xml (0.4.1)
     rake (0.9.2.2)
     redcarpet (2.1.0)

data/README.markdown

@@ -21,15 +21,19 @@ Try:
 
 ## Configuration
 
-Create a `zenpush.yml` file in your home directory. Here is an example:
+Create a `.zenpush.yml` file in your home directory. Here is an example:
 
     ---
-    uri: https://myproduct.zendesk.com
-    user: email@address.com/token
-    password: LoDsQlEtBXSd8clW87DgWi0VNFod3U9xQggzwJEH
+    :uri: https://myproduct.zendesk.com
+    :user: email@address.com/token
+    :password: LoDsQlEtBXSd8clW87DgWi0VNFod3U9xQggzwJEH
 
 You can find your API token at https://myproduct.zendesk.com/settings/api.
 
+Additional configuration (optional):
+
+    :filenames_use_dashes_instead_of_spaces: false 
+
 ## Usage
 
 ### Listing categories
@@ -43,7 +47,6 @@ You can find your API token at https://myproduct.zendesk.com/settings/api.
 ### Listing entries in a forum
 
     $ zp entries -f <forum_id>
-    $ zp entries -F <forum_name>
 
 ### Creating/updating an entry
 
@@ -70,4 +73,4 @@ The gem will automatically discover the category and forum name of a given entry
 
 ## Contributors
 
-* @nfo
+* @nfo

data/lib/zenpush/runner.rb

@@ -52,4 +52,4 @@ module ZenPush
       end
     end
   end
-end
+end

data/lib/zenpush/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module ZenPush
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/zenpush/zendesk.rb

@@ -7,19 +7,34 @@ module ZenPush
   class Zendesk
     include HTTParty
 
+    attr_accessor :options
+
     headers 'Content-Type' => 'application/json'
     # debug_output
 
-    def initialize(b = nil, u = nil, p = nil)
-      if b.nil? || u.nil? || p.nil?
-        creds = YAML.load_file(File.join(ENV['HOME'], '.zenpush.yml'))
-        b ||= creds['uri']
-        u ||= creds['user']
-        p ||= creds['password']
+    def initialize(options = {})
+
+      default_options = {
+        :uri => nil,
+        :user => nil,
+        :password => nil,
+        :filenames_use_dashes_instead_of_spaces => false,
+      }
+
+      zenpush_yml = File.join(ENV['HOME'], '.zenpush.yml')
+
+      if File.readable?(zenpush_yml)
+        zenpush_yml_opts = YAML.load_file(zenpush_yml)
+        default_options.merge!(zenpush_yml_opts)
       end
 
-      self.class.base_uri b + '/api/v1'
-      self.class.basic_auth u, p
+      opts = default_options.merge!(options)
+      opts.each_pair { |k,v| raise "#{k} is nil" if v.nil? }
+
+      @options = opts
+
+      self.class.base_uri opts[:uri] + '/api/v1'
+      self.class.basic_auth opts[:user], opts[:password]
     end
 
     def get(uri, options = {})
@@ -108,4 +123,4 @@ module ZenPush
     end
 
   end
-end
+end

data/lib/zenpush.rb

@@ -11,13 +11,20 @@ module ZenPush
     @z ||= ZenPush::Zendesk.new
   end
 
-  # 
   def file_to_category_forum_entry(file)
     absolute_path = File.realpath(file)
+    file_extension = File.extname(file)
+
     parts = absolute_path.split('/')
-    entry_name = File.basename(absolute_path, '.md') # TODO support .markdown and make it case insensitive
+
+    if ZenPush.z.options[:filenames_use_dashes_instead_of_spaces]
+      parts.each { |el| el.gsub!(/-/, ' ') }
+    end
+
+    entry_name = File.basename(parts[-1], file_extension)
     forum_name = parts[-2]
     category_name = parts[-3]
+
     return category_name, forum_name, entry_name
   end
-end
+end

metadata

@@ -1,82 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: zenpush
 version: !ruby/object:Gem::Version
-  version: 0.1.0
   prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Nicolas Fouché
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: boson
-  requirement: &70100188010080 !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  type: :runtime
+  name: boson
   prerelease: false
-  version_requirements: *70100188010080
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: &70100188008860 !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
-  type: :runtime
+  name: httparty
   prerelease: false
-  version_requirements: *70100188008860
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: &70100187769000 !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
-  type: :runtime
+  name: redcarpet
   prerelease: false
-  version_requirements: *70100187769000
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: &70100187768300 !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :runtime
+  name: awesome_print
   prerelease: false
-  version_requirements: *70100187768300
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: &70100187767540 !ruby/object:Gem::Requirement
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.1
-  type: :runtime
+  name: json_pure
   prerelease: false
-  version_requirements: *70100187767540
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70100187766900 !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
-  version_requirements: *70100187766900
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Push your markdown files to your Zendesk knowledge base
 email:
 - nicolas.fouche@cleverscale.com
@@ -113,22 +143,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -3134286403274189971
+      hash: 1242870539657681757
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -3134286403274189971
+      hash: 1242870539657681757
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Push your markdown files to your Zendesk knowledge base