localio 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 557ff500076f77cf2d3a1c650b62892d60e92b32
-  data.tar.gz: 6d59d95e89c9d8d76cf66caebf6beb8ca5f925ca
+  metadata.gz: d642ee7edb710d0bc09402f50e601c6853d4f1d4
+  data.tar.gz: 242d3eccac6d02fab44194c4d541d33311fe4a41
 SHA512:
-  metadata.gz: 1b2feb3cc3c969f72c3ba540c83f7b38ffd81dee6499737203febc72d4e9e1a2ad4718d92a9ad6fa3e046ba951a9af653d521bab9d05aea2aa6966fb9810aa33
-  data.tar.gz: fb6bdeeb00d8586974bbebcf7a55cd809e30c9db623a11b4fe086de2a20f19817f1d9b6d54a5b6310e9ff26770fe074daa61209566c366b09ee09fac398de5da
+  metadata.gz: 8e4d633dd7957e90545d80afe7dd0d6fe8a02e5a0d06df30ee75148a097e0786dba303e6a8dab2600b8b7b1ed1af6732f29ff17382030086949c8b43df4cafe4
+  data.tar.gz: 976cfba61f9a1475f9b2cc647cf478908f5cbec5c5fe0fdae44b6df04db085a997865d82bdd0f09e94d7828e936aadb15024da7db147f56b9e50af768aa605fb

data/README.md

@@ -113,7 +113,6 @@ Option                      | Description
 `:password`                 | **DEPRECATED** This is deprecated starting version 0.1.0. Please remove it.
 `:client_id`                | (Req.) Your Google CLIENT ID.
 `:client_secret`            | (Req.) Your Google CLIENT SECRET.
-`:access_token`             | Your generated access token. You will get it the first time you log in and give permissions to your generated Google Developer Console application.
 
 Please take into account that from version 0.1.0 of Localio onwards we are using **Google OAuth2 authentication**, as the previous one with login/password has been deprecated by Google and cannot be access anymore starting April 20th 2015.
 
@@ -137,19 +136,9 @@ source :google_drive,
 
 Then, the first time you run it, you will be prompted to follow some instructions. You will be asked to open a website, where you will be prompted for permission to use the Drive API. After you allow it, you will be given an authorization code, which you will have to paste in your terminal screen when prompted.
 
-After all this is done, you will be given in the `:access_token` in the output. Just add it to the `source` parameters, as you did with the id and secret before, and that's it. It will look now like this:
+**NOTE** A hidden file, called .localio.yml, will be created in your Locfile directory. You should **add that file to your ignored resources** in your repository, aka the **.gitignore** file.
 
-```ruby
-source :google_drive,
-       :spreadsheet => '[Localizables] My Project',
-       :client_id => 'XXXXXXXXX-XXXXXXXX.apps.googleusercontent.com',
-       :client_secret => 'asdFFGGhjKlzxcvbnm',
-       :access_token => 'ya29.RAEXXxxxxsadsadajsdhasuidhakjsdhkajhsduiahsduiasd89a8912'
-```
-
-When the Locfile contains the `:access_token`, all the login in process for generating localizables will be automatic and won't require your attention. The parameters for `:client_id` and `:client_secret` are not really needed anymore, although you could leave them there if you want.
-
-**NOTE** As it is a very bad practice to put your sensitive information in a plain file, specially when you would want to upload your project to some repository, it is **VERY RECOMMENDED** that you use environment variables in here. Ruby syntax is accepted so you can use `ENV['CLIENT_SECRET']`, `ENV['CLIENT_ID']` and `ENV['ACCESS_TOKEN']` in here.
+**NOTE** As it is a very bad practice to put your sensitive information in a plain file, specially when you would want to upload your project to some repository, it is **VERY RECOMMENDED** that you use environment variables in here. Ruby syntax is accepted so you can use `ENV['CLIENT_SECRET']` and `ENV['CLIENT_ID']` in here.
 
 For example, this.
 
@@ -157,8 +146,7 @@ For example, this.
 source :google_drive,
        :spreadsheet => '[Localizables] My Project!',
        :client_id => ENV['CLIENT_ID'],
-       :client_secret => ENV['CLIENT_SECRET'],
-       :access_token => ENV['ACCESS_TOKEN']
+       :client_secret => ENV['CLIENT_SECRET']
 ````
 
 And in your .bashrc (or .bash_profile, .zshrc or whatever), you could export those environment variables like this:
@@ -166,7 +154,6 @@ And in your .bashrc (or .bash_profile, .zshrc or whatever), you could export tho
 ````ruby
 export CLIENT_ID="your_client_id"
 export CLIENT_SECRET="your_client_secret"
-export ACCESS_TOKEN="your_access_token"
 ````
 
 ##### XLS

data/lib/localio/config_store.rb

@@ -0,0 +1,37 @@
+class ConfigStore
+  CONFIG_FILE = '.localio.yml'
+
+  def initialize
+    if File.exist? CONFIG_FILE
+      @config = YAML.load_file(CONFIG_FILE)
+    end
+    @config ||= Hash.new
+  end
+
+  def has?(key)
+    @config.has_key?(clean_param key)
+  end
+
+  def get(key)
+    @config[clean_param key]
+  end
+
+  def store(key, data)
+    @config[clean_param key] = data
+  end
+
+  def persist
+    File.open(CONFIG_FILE, 'w') do |h|
+      h.write @config.to_yaml
+    end
+  end
+
+  private
+  def clean_param(param)
+    if param.is_a?(Symbol)
+      param.to_s
+    else
+      param
+    end
+  end
+end

data/lib/localio/processors/google_drive_processor.rb

@@ -1,10 +1,10 @@
 require 'google_drive'
 require 'localio/term'
+require 'localio/config_store'
 
 class GoogleDriveProcessor
 
   def self.load_localizables(platform_options, options)
-
     # Parameter validations
     spreadsheet = options[:spreadsheet]
     raise ArgumentError, ':spreadsheet required for Google Drive source!' if spreadsheet.nil?
@@ -18,13 +18,10 @@ class GoogleDriveProcessor
     # New authentication way
     client_id = options[:client_id]
     client_secret = options[:client_secret]
-    access_token = options[:access_token]
 
-    # We need client_id / client_secret if we dont have an access token
-    if access_token.nil?
-      raise ArgumentError, ':client_id required for Google Drive. Check how to get it here: https://developers.google.com/drive/web/auth/web-server' if client_id.nil?
-      raise ArgumentError, ':client_secret required for Google Drive. Check how to get it here: https://developers.google.com/drive/web/auth/web-server' if client_secret.nil?
-    end
+    # We need client_id / client_secret
+    raise ArgumentError, ':client_id required for Google Drive. Check how to get it here: https://developers.google.com/drive/web/auth/web-server' if client_id.nil?
+    raise ArgumentError, ':client_secret required for Google Drive. Check how to get it here: https://developers.google.com/drive/web/auth/web-server' if client_secret.nil?
 
     override_default = nil
     override_default = platform_options[:override_default] unless platform_options.nil? or platform_options[:override_default].nil?
@@ -32,25 +29,37 @@ class GoogleDriveProcessor
     # Log in and get spreadsheet
     puts 'Logging in to Google Drive...'
     begin
-      if access_token.nil?
-        puts "No :access_token found. Let\'s proceed to get one!".red
-        client = Google::APIClient.new application_name: 'Localio', application_version: Localio::VERSION
-        auth = client.authorization
-        auth.client_id = client_id
-        auth.client_secret = client_secret
-        auth.scope =
-            "https://www.googleapis.com/auth/drive " +
-                "https://spreadsheets.google.com/feeds/"
-        auth.redirect_uri = "urn:ietf:wg:oauth:2.0:oob"
+      client = Google::APIClient.new application_name: 'Localio', application_version: Localio::VERSION
+      auth = client.authorization
+      auth.client_id = client_id
+      auth.client_secret = client_secret
+      auth.scope =
+          "https://docs.google.com/feeds/" +
+              "https://www.googleapis.com/auth/drive " +
+              "https://spreadsheets.google.com/feeds/"
+      auth.redirect_uri = "urn:ietf:wg:oauth:2.0:oob"
+
+      config = ConfigStore.new
+
+      access_token = nil
+
+      if config.has? :refresh_token
+        puts 'Refreshing auth token...'
+        auth.refresh_token = config.get :refresh_token
+        auth.refresh!
+        access_token = auth.access_token
+      else
         puts "1. Open this page in your browser:\n#{auth.authorization_uri}\n\n"
         puts "2. Enter the authorization code shown in the page: "
         auth.code = $stdin.gets.chomp
         auth.fetch_access_token!
         access_token = auth.access_token
-        puts '\n**IMPORTANT** You can store your access_token in the Locfile :source parameter for avoiding this step in the future:\n'
-        puts ":access_token => '#{access_token}'".yellow
-        puts '\n\n'
       end
+
+      config.store :refresh_token, auth.refresh_token
+      config.store :access_token, auth.access_token
+      config.persist
+
       # Creates a session
       session = GoogleDrive.login_with_oauth(access_token)
     rescue => e
@@ -70,7 +79,7 @@ class GoogleDriveProcessor
       when 0
         abort "Unable to find any spreadsheet matching your criteria: #{spreadsheet}"
       else
-        abort 'More than one match found. You have to be more specific!'
+        abort "More than one match found (#{matching_spreadsheets.join ', '}). You have to be more specific!"
     end
 
 

data/lib/localio/version.rb

@@ -1,3 +1,3 @@
 module Localio
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/localio.gemspec

@@ -4,20 +4,20 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'localio/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "localio"
-  spec.version       = Localio::VERSION
-  spec.authors       = ["Nacho Lopez"]
-  spec.email         = ["nacho@nlopez.io"]
-  spec.description   = %q{Automatic Localizable file generation for multiple platforms (Rails YAML, Android, Java Properties, iOS, JSON, .NET ResX)}
-  spec.summary       = %q{Automatic Localizable file generation for multiple type of files, like Android string.xml, Xcode Localizable.strings, JSON files, Rails YAML files, Java properties, etc. reading from Google Drive and Excel spreadsheets as base.}
-  spec.homepage      = "http://github.com/mrmans0n/localio"
-  spec.license       = "MIT"
+  spec.name = "localio"
+  spec.version = Localio::VERSION
+  spec.authors = ["Nacho Lopez"]
+  spec.email = ["nacho@nlopez.io"]
+  spec.description = %q{Automatic Localizable file generation for multiple platforms (Rails YAML, Android, Java Properties, iOS, JSON, .NET ResX)}
+  spec.summary = %q{Automatic Localizable file generation for multiple type of files, like Android string.xml, Xcode Localizable.strings, JSON files, Rails YAML files, Java properties, etc. reading from Google Drive and Excel spreadsheets as base.}
+  spec.homepage = "http://github.com/mrmans0n/localio"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files`.split($/)
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  
+
   spec.executables << "localize"
 
   spec.add_development_dependency "rspec"
@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  
+
   spec.add_dependency "micro-optparse", "~> 1.2"
   spec.add_dependency "google_drive", "1.0.0"
   spec.add_dependency "spreadsheet", "~> 1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: localio
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nacho Lopez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -139,6 +139,7 @@ files:
 - Rakefile
 - bin/localize
 - lib/localio.rb
+- lib/localio/config_store.rb
 - lib/localio/filter.rb
 - lib/localio/formatter.rb
 - lib/localio/localizable_writer.rb