code42 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 204c4d637432178116bea0a22a7c4e96cb23fa4f
-  data.tar.gz: db890339d0aa2ad510ff27e2d4d1c6fef6e674ca
+  metadata.gz: 8bf8ccbbf30229f5782e6820c7e65d7a231f2543
+  data.tar.gz: 957d1a88845196fb072e784ff74378638f497c65
 SHA512:
-  metadata.gz: 15576c7015eed483f0b87b9f95400e6ef24442ceb6bedcd805bf58f272544e4b4dba047feef0ef1a53af91e7bac91ce27aff11dafc6a17867509087b66670279
-  data.tar.gz: ef2c016a06290d0440b70ab303f0015e7e1895584f68d5483215d0cfe7444b00464e01a0e1a9990cc26a7e375d8d4d60d9fd6aa37f8fd39d7f1b104296946a06
+  metadata.gz: e0b5aaa0a70a0c2e253d009c78aec1f8e6268e85678fa66b3913b422285de5de3f60f761d2804e7374f0359f4749b536a27edd9cc8125440cd11341ffd446ae0
+  data.tar.gz: 43ccc2d3d9727797a2fe5ba31b3b6edccbeca692f527b8659f05c87d793a6e9504e35441b0aae94606dc24c1bc0ad7c82c8d4da987b85926876143d544d62ad2

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --format progress
+--require spec_helper

data/code42.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Provides a Ruby interface to the Code42 API}
   gem.summary       = %q{...}
   gem.homepage      = "http://www.crashplan.com/apidocviewer/"
+  gem.license       = 'Apache'
 
   gem.add_development_dependency 'rspec',   '~> 2.14.0'
   gem.add_development_dependency 'webmock', '~> 1.11.0'
@@ -20,6 +21,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activesupport',       '>= 3.2.0'
   gem.add_dependency 'faraday_middleware',  '~> 0.9.1'
 
+  gem.required_ruby_version = '>= 1.9'
+
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/lib/code42.rb

@@ -1,28 +1,34 @@
-require "date"
-require "active_support/core_ext/array/extract_options"
-require "active_support/core_ext/hash/keys"
-require "active_support/core_ext/string/inflections"
-require "active_support/core_ext/object/blank"
-require "active_support/core_ext/object/try"
-require "active_support/notifications"
-require "code42/version"
-require "code42/client"
-require "code42/settings"
-require "code42/error"
-require "code42/connection"
-require "code42/attribute"
-require "code42/attribute_serializer"
-require "code42/resource"
-require "code42/org"
-require "code42/user"
-require "code42/computer"
-require "code42/diagnostic"
-require "code42/ping"
-require "code42/token"
-require "code42/role"
-require "code42/role_collection"
-require "code42/token_validation"
-require "code42/permission"
+require 'date'
+require 'active_support/core_ext/array/extract_options'
+require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/string/inflections'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/try'
+require 'active_support/notifications'
+require 'code42/version'
+require 'code42/client'
+require 'code42/settings'
+require 'code42/error'
+require 'code42/connection'
+require 'code42/attribute'
+require 'code42/attribute_serializer'
+require 'code42/resource'
+require 'code42/org'
+require 'code42/user'
+require 'code42/computer'
+require 'code42/diagnostic'
+require 'code42/ping'
+require 'code42/token'
+require 'code42/role'
+require 'code42/role_collection'
+require 'code42/token_validation'
+require 'code42/permission'
+require 'code42/product_license'
+require 'code42/server_settings'
+require 'code42/destination'
+require 'code42/server'
+require 'code42/server_connection_string'
+require 'code42/store_point'
 
 module Code42
   class << self
@@ -40,8 +46,9 @@ module Code42
       self
     end
 
-    def respond_to_missing?(method_name, include_private=false); client.respond_to?(method_name, include_private); end if RUBY_VERSION >= "1.9"
-    def respond_to?(method_name, include_private=false); client.respond_to?(method_name, include_private) || super; end if RUBY_VERSION < "1.9"
+    def respond_to_missing?(method_name, include_private=false)
+      client.respond_to?(method_name, include_private)
+    end
 
     private
 
@@ -51,3 +58,35 @@ module Code42
     end
   end
 end
+
+class RequestLogger < Faraday::Request
+  def call(env)
+    debug('request') { dump_body(env[:body]) }
+    super
+  end
+end
+
+class BodyLogger < Faraday::Response::Logger
+  def call(env)
+    debug('response') { dump_body(env[:body]) }
+    super
+  end
+
+  def on_complete(env)
+    debug('response') { dump_body(env[:body]) }
+    super
+  end
+
+  def dump_body(body)
+    if body.respond_to?(:to_str)
+      body.to_str
+    else
+      pretty_inspect(body)
+    end
+  end
+
+  def pretty_inspect(body)
+    require 'pp' unless body.respond_to?(:pretty_inspect)
+    body.pretty_inspect
+  end
+end

data/lib/code42/api/destination.rb

@@ -0,0 +1,18 @@
+module Code42
+  module API
+    module Destination
+      def destinations
+        objects_from_response(Code42::Destination, :get, 'destinations', key: 'destinations')
+      end
+
+      def destination(id)
+        object_from_response(Code42::Destination, :get, "destination/#{id}")
+      end
+
+      def create_destination(attrs)
+        response = post('Destination', attrs)
+        response && response['data'].is_a?(Array)
+      end
+    end
+  end
+end

data/lib/code42/api/diagnostic.rb

@@ -0,0 +1,9 @@
+module Code42
+  module API
+    module Diagnostic
+      def diagnostic
+        object_from_response(Code42::Diagnostic, :get, 'diagnostic')
+      end
+    end
+  end
+end

data/lib/code42/api/org.rb

@@ -68,11 +68,11 @@ module Code42
       end
 
       def activate_org(id = 'my', attrs = {})
-        object_from_response(Code42::Org, :delete, "orgDeactivation/#{id}", attrs)
+        object_from_response(Code42::Org, :delete, "OrgDeactivation/#{id}", attrs)
       end
 
       def deactivate_org(id = 'my', attrs = {})
-        object_from_response(Code42::Org, :put, "orgDeactivation/#{id}", attrs)
+        object_from_response(Code42::Org, :put, "OrgDeactivation/#{id}", attrs)
       end
 
       def block_org(id = 'my', attrs = {})
@@ -83,6 +83,9 @@ module Code42
         object_from_response(Code42::Org, :delete, "orgBlock/#{id}", attrs)
       end
 
+      def org_share_destinations(id)
+        get("orgShareDestinations/#{id}")['data']
+      end
 
     end
   end

data/lib/code42/api/product_license.rb

@@ -0,0 +1,21 @@
+module Code42
+  module API
+    module ProductLicense
+      def product_licenses
+        objects_from_response(Code42::ProductLicense, :get, 'productLicense', key: 'products')
+      end
+
+      def remove_product_license(id)
+        delete("productLicense/#{id}")
+      end
+
+      def add_product_license(license_key)
+        attrs = {
+          product_license: license_key,
+          key: 'products'
+        }
+        objects_from_response(Code42::ProductLicense, :put, 'productLicense', attrs)
+      end
+    end
+  end
+end

data/lib/code42/api/server.rb

@@ -0,0 +1,21 @@
+module Code42
+  module API
+    module Server
+      def servers(params = {})
+        objects_from_response(Code42::Server, :get, 'server', params.merge(key: 'servers'))
+      end
+
+      def server(id, params = {})
+        if id.is_a? Fixnum
+          object_from_response(Code42::Server, :get, "server/#{id}", params)
+        elsif id.is_a? String
+          servers(params.merge(q: id)).first
+        end
+      end
+
+      def create_server(attrs)
+        object_from_response(Code42::Server, :post, 'server', attrs)
+      end
+    end
+  end
+end

data/lib/code42/api/server_connection_string.rb

@@ -0,0 +1,9 @@
+module Code42
+  module API
+    module ServerConnectionString
+      def server_connection_string(id)
+        object_from_response(Code42::ServerConnectionString, :get, "serverConnectionString/#{id}")
+      end
+    end
+  end
+end

data/lib/code42/api/server_settings.rb

@@ -0,0 +1,13 @@
+module Code42
+  module API
+    module ServerSettings
+      def server_settings(id)
+        object_from_response(Code42::ServerSettings, :get, "serverSettings/#{id}")
+      end
+
+      def update_server_settings(id, attrs)
+        put("serverSettings/#{id}", attrs)
+      end
+    end
+  end
+end

data/lib/code42/api/store_point.rb

@@ -0,0 +1,22 @@
+module Code42
+  module API
+    module StorePoint
+
+      def find_store_points_by_name(name, params = {})
+        objects_from_response(Code42::StorePoint, :get, 'storePoint', params.merge(key: 'storepoints', q: name))
+      end
+
+      def find_store_point_by_id(id, params = {})
+        object_from_response(Code42::StorePoint, :get, "storePoint/#{id}", params)
+      end
+
+      def store_points(params = {})
+        objects_from_response(Code42::StorePoint, :get, 'storePoint', params.merge(key: 'storepoints'))
+      end
+
+      def update_store_point(id, params)
+        object_from_response(Code42::StorePoint, :put, "storePoint/#{id}", params)
+      end
+    end
+  end
+end

data/lib/code42/api/token.rb

@@ -8,6 +8,13 @@ module Code42
         object_from_response(Code42::Token, :post, "authToken")
       end
 
+      def apply_mlk(mlk, attrs)
+        settings.mlk = mlk
+        response = object_from_response(Code42::Token, :post, 'authToken', attrs)
+        settings.mlk = nil
+        response
+      end
+
       # Returns LoginToken and ServerUrl
       # @return [CrashPlan::Token] Token to pass to ServerUrl's AuthToken resource
       def get_login_token

data/lib/code42/client.rb

@@ -1,3 +1,4 @@
+require 'forwardable'
 require 'json'
 Dir[File.dirname(__FILE__) + '/api/*.rb'].each { |file| require file }
 
@@ -8,10 +9,21 @@ module Code42
     include Code42::API::Org
     include Code42::API::Computer
     include Code42::API::Token
+    include Code42::API::ProductLicense
+    include Code42::API::ServerSettings
+    include Code42::API::Destination
+    include Code42::API::Server
     include Code42::API::PasswordReset
+    include Code42::API::StorePoint
+    include Code42::API::Diagnostic
+    include Code42::API::ServerConnectionString
 
     attr_reader :settings
 
+    extend Forwardable
+
+    instance_delegate make_request: :connection
+
     def initialize(options = {})
       self.settings = options
     end
@@ -43,25 +55,6 @@ module Code42
       settings.token = token.to_s
     end
 
-    def diagnostic
-      object_from_response(Diagnostic, :get, 'diagnostic')
-    end
-
-    # Block a computer from backing up
-    # @return [Code42::Computer] The blocked computer
-    # @params id [Integer, String] The computer ID you want to block
-    def block_computer(id)
-      put("computerblock/#{id}")
-    end
-
-    def unblock_computer(id)
-      delete("computerblock/#{id}")
-    end
-
-    def deactivate_org(id)
-      put("OrgDeactivation/#{id}")
-    end
-
     def connection
       @connection ||= begin
                         connection = Connection.new
@@ -80,6 +73,9 @@ module Code42
       if settings.token
         @connection.token = settings.token
       end
+      if settings.mlk
+        @connection.mlk = settings.mlk
+      end
       @connection
     end
 
@@ -120,24 +116,20 @@ module Code42
       array.map { |element| klass.deserialize_and_initialize(element, self) }
     end
 
-    def get(path, data = {})
-      make_request(:get, path, data)
-    end
-
-    def post(path, data = {})
-      make_request(:post, path, data)
+    def get(path, data = {}, &block)
+      make_request(:get, path, data, &block)
     end
 
-    def put(path, data = {})
-      make_request(:put, path, data)
+    def post(path, data = {}, &block)
+      make_request(:post, path, data, &block)
     end
 
-    def delete(path, data = {})
-      make_request(:delete, path, data)
+    def put(path, data = {}, &block)
+      make_request(:put, path, data, &block)
     end
 
-    def make_request(method, *args)
-      connection.make_request(method, *args)
+    def delete(path, data = {}, &block)
+      make_request(:delete, path, data, &block)
     end
   end
 end

data/lib/code42/computer.rb

@@ -1,6 +1,5 @@
 module Code42
   class Computer < Resource
-
     attribute :id, :from => 'computerId'
 
     def unblock
@@ -10,6 +9,5 @@ module Code42
     def block
       client.block_computer(id)
     end
-
   end
 end

data/lib/code42/connection.rb

@@ -6,7 +6,7 @@ require 'code42/error'
 
 module Code42
   class Connection
-    attr_accessor :host, :port, :scheme, :path_prefix, :username, :password, :adapter, :token, :verify_https, :logger, :last_response
+    attr_accessor :host, :port, :scheme, :path_prefix, :username, :password, :adapter, :token, :verify_https, :logger, :mlk, :last_response
 
     def initialize(options = {})
       self.host         = options[:host]
@@ -21,8 +21,10 @@ module Code42
 
     extend Forwardable
 
-    delegate %i(host port path_prefix scheme) => :adapter
-    delegate %i(host= port= path_prefix= scheme=) => :adapter
+    instance_delegate %i(host  port  path_prefix  scheme)  => :adapter
+    instance_delegate %i(host= port= path_prefix= scheme=) => :adapter
+
+    instance_delegate %i(get post put delete) => :adapter
 
     def verify_https=(verify_https)
       adapter.ssl[:verify] = verify_https
@@ -58,6 +60,12 @@ module Code42
       @token
     end
 
+    def mlk=(mlk)
+      @mlk = mlk
+      adapter.headers['C42-MasterLicenseKey'] = "BASIC #{mlk}"
+      @mlk
+    end
+
     def username=(username)
       @username = username
       adapter.basic_auth(username, password) if has_valid_credentials?
@@ -68,9 +76,9 @@ module Code42
       adapter.basic_auth(username, password) if has_valid_credentials?
     end
 
-    def make_request(method, *args)
+    def make_request(method, *args, &block)
       begin
-        @last_response = response = self.send(method, *args)
+        @last_response = response = self.send(method, *args, &block)
         ActiveSupport::Notifications.instrument('code42.request', {
           method:   method,
           args:     args,
@@ -83,29 +91,9 @@ module Code42
       response.body
     end
 
-    def get(path, data)
-      adapter.get(path, data)
-    end
-
-    def put(path, data)
-      adapter.put path, data
-    end
-
-    def post(path, data)
-      adapter.post path, data
-    end
-
-    def delete(path, data)
-      adapter.delete(path, data)
-    end
-
-    def respond_to?(method_name, include_private = false)
-      adapter.respond_to?(method_name, include_private) || super
-    end if RUBY_VERSION < "1.9"
-
     def respond_to_missing?(method_name, include_private = false)
       adapter.respond_to?(method_name, include_private) || super
-    end if RUBY_VERSION >= "1.9"
+    end
 
     private