ga-shikomi 0.1.1 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWU4MzQ3ZDI4NDkxZjU5NjE3YmQxNjg3MTQzMWUxYjg3YWViYWVmYg==
-  data.tar.gz: !binary |-
-    Yjg2MDZlMjc5M2M3OTM3Y2YyZDEwY2VkMDYwZDA4NTc3ZmUyOWY2YQ==
+SHA1:
+  metadata.gz: aefa66eed695aeebed4c52f2aa4fcfb2ea7ba535
+  data.tar.gz: f67aabae92c5059be40011dc4b7c778ce89134ec
 SHA512:
-  metadata.gz: !binary |-
-    MjU2ZjEwMzgwM2VlMDllYjdlNjczNzE2YWUzY2E2NmVhZDRjMWZhYTFiOWE0
-    MmJiNzY5MDYzNzRmMzk2MjY5NTAyZDEyNmM5YzhmNGJhMTA2YmZjMzBjZGI4
-    ZjY4YzYxODUwODVmZGMxYjA5ZjBmN2MxMWQ3ZjYxMWQ5NDI1MWE=
-  data.tar.gz: !binary |-
-    NWYxOTA2ZWFhM2UyYzIwM2Q5NjUxODEzMDM1ZmZiY2NmMmEzYzhhODk0MDFh
-    ODVkY2IwZTljZjc5NjkyN2E3YTJhMDgxMTYxOWY3YTAyOTZhZWJiMDU1OGJm
-    OTBhYWMxOTNiNDNkNWUyZTMzY2NhMmI4NGEwNDA4MTZlOGU2MzQ=
+  metadata.gz: f442d95ccac518787f6b235fc30c8ca596be7368c0a743af5f863615b14da616682d3afe97b33be9d21cbcbfcee4152a785cda5c8a5aa19cf13fcde832111ba0
+  data.tar.gz: f27d1ecde593533849ed0ff3db2128f2c3608fc9d54056bae7f07010e5d78df68a3b6630154be307577bed4a212ae5c74add467f33da536ad72a5943283e7124

data/ga_shikomi.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "google-api-client"
+  spec.add_runtime_dependency "google-api-client", ">= 0.8.6", "< 0.9"
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "hirb"
 

data/lib/ga_shikomi/api.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'google/api_client'
 require 'google/api_client/client_secrets'
 require 'google/api_client/auth/installed_app'
@@ -8,6 +9,8 @@ module GAShikomi
   class Api
     class InexpectantResponse < StandardError; end
 
+    GOOGLE_API_KEYS = %w(GOOGLE_API_CREDENTIAL GOOGLE_API_SECRETS)
+
     #
     # [param] String store
     #
@@ -20,31 +23,59 @@ module GAShikomi
     end
     attr_reader :client, :analytics, :last_request
 
+    def init_and_auth_analytics(store)
+      init_client
+
+      if GOOGLE_API_KEYS.all? {|e| ENV.has_key? e}
+        init_and_auth_with_env
+      else
+        init_and_auth_with_file_storage(store)
+      end
+
+      @analytics = client.discovered_api('analytics', 'v3')
+    end
+
+    def init_and_auth_with_env
+      credential = ::Google::APIClient::Storage.new(EnvStore.new(ENV))
+      credential.authorize
+      secrets    = ::Google::APIClient::ClientSecrets.new(JSON.parse(ENV['GOOGLE_API_SECRETS']))
+
+      client.authorization = credential.authorization
+    end
+
     #
     # [param] String store
     #
-    def init_and_auth_analytics(store)
-      @client = ::Google::APIClient.new(
-                                    :application_name    => :gacli,
-                                    :application_version => VERSION)
-
+    def init_and_auth_with_file_storage(store)
       credential = ::Google::APIClient::FileStorage.new(store)
       secrets    = ::Google::APIClient::ClientSecrets.load(File.dirname(store))
 
       if credential.authorization.nil?
-        flow = ::Google::APIClient::InstalledAppFlow.new(
-          :client_id     => secrets.client_id,
-          :client_secret => secrets.client_secret,
-          :scope         => ['https://www.googleapis.com/auth/analytics',
-                             'https://www.googleapis.com/auth/analytics.edit'])
+        flow = flow(secrets)
 
         client.authorization = flow.authorize
         credential.write_credentials(client.authorization)
       else
         client.authorization = credential.authorization
       end
+    end
 
-      @analytics = client.discovered_api('analytics', 'v3')
+    def init_client
+      @client = ::Google::APIClient.new(
+                                    :application_name    => :gacli,
+                                    :application_version => VERSION)
+    end
+
+    #
+    # [param]  Google::APIClient::ClientSecrets
+    # [return] Google::APIClient::InstalledAppFlow
+    #
+    def flow(secrets)
+      ::Google::APIClient::InstalledAppFlow.new(
+          :client_id     => secrets.client_id,
+          :client_secret => secrets.client_secret,
+          :scope         => ['https://www.googleapis.com/auth/analytics',
+                             'https://www.googleapis.com/auth/analytics.edit'])
     end
 
     #

data/lib/ga_shikomi/env_store.rb

@@ -0,0 +1,25 @@
+require 'json'
+
+class EnvStore
+  #
+  # [param] Hash env
+  #
+  def initialize(env)
+    @env = env
+  end
+
+  #
+  # [return] Hash
+  #
+  def load_credentials
+    JSON.parse(@env['GOOGLE_API_CREDENTIAL'])
+  end
+
+  #
+  # [param]  Hash credentials_hash
+  # [return] Hash
+  #
+  def write_credentials(credentials_hash)
+    credentials_hash
+  end
+end

data/lib/ga_shikomi/version.rb

@@ -1,3 +1,3 @@
 module GAShikomi
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,125 +1,131 @@
 --- !ruby/object:Gem::Specification
 name: ga-shikomi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - wtnabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: minitest-power_assert
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1'
 description: Now, You can fetch general ga data.
@@ -130,7 +136,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.md
 - Rakefile
@@ -140,6 +146,7 @@ files:
 - lib/ga_shikomi/api.rb
 - lib/ga_shikomi/command.rb
 - lib/ga_shikomi/config.rb
+- lib/ga_shikomi/env_store.rb
 - lib/ga_shikomi/renderer.rb
 - lib/ga_shikomi/subcommand/accounts.rb
 - lib/ga_shikomi/subcommand/base.rb
@@ -165,17 +172,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Google Analytics API wrapper for CLI written in Ruby.