hse 0.1.16 → 0.1.17

data/hse.gemspec

@@ -26,8 +26,9 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency(%q<json>, ["~> 1.7.5"])
   gem.add_runtime_dependency(%q<mime-types>, ["~> 1.16"])
-  gem.add_runtime_dependency(%q<typhoeus>, ["~> 0.6.3"])
-  #gem.add_runtime_dependency(%q<rest-client>)
+  gem.add_runtime_dependency(%q<addressable>)
+  #gem.add_runtime_dependency(%q<typhoeus>, ["~> 0.6.3"])
+  gem.add_runtime_dependency(%q<rest-client>)
   gem.add_runtime_dependency(%q<thor>, ["~> 0.15"])
   gem.add_runtime_dependency(%q<uuidtools>, ["~> 2.1"])
   # gem.add_runtime_dependency(%q<redcarpet>, ["~> 2.2.2"])

data/lib/hse/cli.rb

@@ -2,7 +2,8 @@
 require 'thor'
 require 'thor/actions'
 require 'uuidtools'
-require 'typhoeus'
+#require 'typhoeus'
+require 'rest_client'
 require 'pp'
 # require 'redcarpet'
 
@@ -86,9 +87,9 @@ module Hse
     #   puts "_ID = #{_id} - #{uuid}"
     # end
 
-    desc 'get [DOC]', 'get doc by id'
-    def get(doc = false, env = 'default')
-      remote(env).get doc
+    desc 'get [ID]', 'get doc by id'
+    def get(id = false, env = 'default')
+      remote(env).get_id id
     end
 
     desc 'user [EMAIL] push=false', 'get/push user by email'

data/lib/hse/remote.rb

@@ -6,28 +6,12 @@ module Hse
     def initialize(app_dir, env = 'default') #, config_path = nil)
       self.env         = env
       self.app_dir     = File.expand_path(app_dir) + '/'
-      #self.config_path = config_path
-      #load_config
       load_couchapprc
     end
 
-    # def config_path=(config_path)
-    #   @config_path = config_path || File.join(app_dir, 'config.js')
-    # end
-
-    # def load_config
-    #   if File.readable?(config_path)
-    #     @config = JSON.parse(File.read(config_path))
-    #   else
-    #     raise "Could not find config at '#{config_path}'. Run `soca init`"
-    #   end
-    # end
-
     def load_couchapprc
       @config ||= {}
       @config['couchapprc'] = JSON.parse(File.read(File.join(app_dir, '.couchapprc')))
-      puts "COUCHAPPRC #{@config['couchapprc']}"
-      #run_hooks!(:after_load_couchapprc)
     end
 
     def db_url
@@ -36,26 +20,29 @@ module Hse
       else
         env_config = config['couchapprc']['env'][env]
         raise "No such env: #{env}" unless env_config && env_config['db']
-        puts "DB URL #{env_config['db']}"
+        puts "db_url #{env_config['db']}"
         env_config['db']
       end
     end
 
-    def get doc
-      path = "#{db_url}/#{doc[:_id]}"
-      response = Typhoeus::Request.get(path)
-      puts "GET Response: #{response.code} #{response.body[0..200]}"
-      response.code == 200 ? response.body : nil
+    def get_id id
+      path = "#{db_url}/#{id}?include_docs=true"
+      response = RestClient.get path, :content_type => :json, :accept => :json #  rescue nil
+      return "no _id #{id}" unless response.code == 200
+      result = JSON.parse(response.body)
+      response.code == 200 ? result : nil
     end
 
     def user email, push
       server = "#{db_url}".split("/")[0..-2].join("/")
       path = "#{server}/_users/org.couchdb.user:#{email}"
-      response = Typhoeus::Request.get(path)
-      #puts "GET Response: #{response.code} #{response.body[0..200]}"
+      puts "USER PATH #{path}"
+      #response = Typhoeus::Request.get(path)
+      response = RestClient.get path, :content_type => :json, :accept => :json #  rescue nil
+      puts "GET Response: #{response.code} #{response.body[0..200]}"
       response.code == 200 ? response.body : nil
       user = JSON.parse(response.body)
-      puts user.inspect
+      pp user
       return unless push
       # curl -vX PUT $HOST/_users/org.couchdb.user:bob -d '{"name":"bob", "password":"bobspassword", "roles":[], "type":"user"}' -H "Content-Type: application/json"
       picture = email.split("@").first
@@ -65,16 +52,15 @@ module Hse
       json = newuser.to_json
       path = "#{server}/_users/#{id}"
       #headers = {"Content-Type" => "application/json"}
-      response = Typhoeus::Request.put(path, body:json)
+      #response = Typhoeus::Request.put(path, body:json)
       puts "PUT Response: #{response.code} #{response.body[0..200]}"
     end
 
     def get_doc_revision doc
       puts "getting current revision"
-      current = get doc
+      current = get_id doc
       if current
         current_json = JSON.parse(current)
-        #self.revision = current_json['_rev']
         puts "current revision: #{current_json['_rev']}"
       end
       current ? current_json['_rev'] : nil
@@ -84,7 +70,7 @@ module Hse
       path = "#{db_url}/#{id}"
       puts "remote: PUT path #{path}"
       puts "remote: PUT body: #{body[0..80]} ..."
-      response = Typhoeus::Request.put(path, :body => body)
+      #response = Typhoeus::Request.put(path, :body => body)
       puts "PUT Response: #{response.code} #{response.body[0..200]}"
       response
     end

data/lib/hse/version.rb

@@ -1,3 +1,3 @@
 module Hse
-  VERSION = "0.1.16"
+  VERSION = "0.1.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hse
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -108,21 +108,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement