venus 0.7.4 → 0.7.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3c4d40a490ef2128e5003adf4340035b8dfbe358
+  data.tar.gz: c12827a2c3f233262d9b72310264df53ca035c16
+SHA512:
+  metadata.gz: 7420ae266f6b79bc43fb4f8de7754b8d953009f6811f684106aa2a24b3302dc327d24c6c0f1abedfa892fffe95162cab8c745333b39eafa90e1a42b89e8cccd9
+  data.tar.gz: 05348bc1d6ad2b9a367d5e07c13219019fdefe8ef3795dbc95b0f6d6dc468c98ca2d396a696f11ff5f4c96c805c834af8e398f710a8839ed9b8b61264f832695

data/lib/generators/venus/deploy/templates/deploy.erb

@@ -6,8 +6,8 @@ rescue LoadError
 end
 
 <% if @use_rvm %> 
-require "rvm/capistrano"
 set :rvm_type, :system
+require "rvm/capistrano"
 <% end %>
 
 require 'capistrano/ext/multistage'

data/lib/generators/venus/helpers.rb

@@ -139,7 +139,7 @@ module Venus
       end
 
       def insert_into_setting_yml(to_file, key, value, opts = {})
-        unless file_has_content?(to_file, "  #{key}:")
+        unless file_has_content?(to_file, "\n  #{key}:")
           value = '' if opts[:hide_in_example] && to_file.index('.example')
           value = ask?("value of #{key} in #{to_file}#{opts[:hint] ? " (#{opts[:hint]})" : ""}", '') if value == :ask
           inserted_value = (value.index("\n") ? value : "\"#{value}\"") if value

data/lib/generators/venus/omniauth/omniauth_generator.rb

@@ -17,7 +17,7 @@ module Venus
         @devise_scope = @devise_model.underscore
         @devise_table = @devise_model.tableize
         @providers = {}
-        [:facebook, :github, :twitter].each do |provider|
+        [:facebook, :github, :twitter, :google_oauth2].each do |provider|
           if ask?("Use '#{provider}'?", true)
             token = ask?("#{provider.capitalize} App ID?", '267188576687915')
             secret = ask?("#{provider.capitalize} App Secret?", '84f72292e1f6b299f4a668f12ed1a7f2')
@@ -32,6 +32,7 @@ module Venus
       def gemfile
         add_gem('omniauth')
         @providers.each do |provider, |
+          provider = "google-oauth2" if provider.to_s.index("google")
           add_gem("omniauth-#{provider}")
         end
         bundle_install
@@ -52,7 +53,7 @@ module Venus
       def model
         generate "model authorization provider:string uid:string auth_type:string auth_id:integer auth_data:text"
         insert_template 'app/models/authorization.rb', 'authorization.rb', :after => "ActiveRecord::Base\n"
-        template 'omniauthable.rb', 'app/lib/omniauthable.rb'
+        template 'omniauthable.rb.erb', 'app/lib/omniauthable.rb'
         insert_template("app/models/#{@devise_scope}.rb", "user.erb", :before => "\nend\n")
         sleep(1)
         migration_template "migrations.rb.erb", "db/migrate/add_index_for_authorizations_and_add_column_for_#{@devise_table}"

data/lib/generators/venus/omniauth/templates/{omniauthable.rb → omniauthable.rb.erb}

@@ -11,28 +11,40 @@ module Omniauthable
       authorization = Authorization.find_by_provider_and_uid(authhash['provider'], authhash['uid'])
       return authorization.auth if authorization
       instance = send "initialize_from_omniauth_#{authhash['provider']}", authhash
-      if self.find_by_email(instance.email)
-        instance = _
+      if u = self.find_by_email(instance.email)
+        instance = u
       else
         instance.save
-        instance.bind_service(authhash)
       end
+      instance.bind_service(authhash)
       instance
     end
 
     private
 
+<% if @providers[:facebook] %>
     def initialize_from_omniauth_facebook(authhash)
       self.new(:email => authhash['info']['email'], :name => authhash['info']['name'])
     end
+<% end %>
 
+<% if @providers[:twitter] %>
     def initialize_from_omniauth_twitter(authhash)
       self.new(:email => authhash['info']['email'], :name => authhash['info']['name'])
     end
+<% end %>
 
+<% if @providers[:github] %>
     def initialize_from_omniauth_github(authhash)
       self.new(:email => authhash['info']['email'], :name => authhash['info']['name'])
     end
+<% end %>
+
+<% if @providers[:google_oauth2] %>
+    def initialize_from_omniauth_google_oauth2(authhash)
+      self.new(:email => authhash['extra']['raw_info']['email'], :name => authhash['extra']['raw_info']['name'])
+    end
+<% end %>
 
   end
 
@@ -45,9 +57,14 @@ module Omniauthable
   end
 
   def can_bind_to
-    Setting.providers - (authorizations.map {|auth| auth.provider})
+    Setting.providers - has_binds
   end
 
+  def has_binds
+    authorizations.map(&:provider)
+  end
+
+
   def password_required?
     false
   end

data/lib/venus/version.rb

@@ -1,3 +1,3 @@
 module Venus
-  VERSION = "0.7.4"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,66 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: venus
 version: !ruby/object:Gem::Version
-  version: 0.7.4
-  prerelease: 
+  version: 0.7.6
 platform: ruby
 authors:
 - marsz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.1'
-description: ! ' Use rails generator to install and setup rubygems such as rspec,
-  devise, omniauth-facebook...etc. Also can use in exists projects. '
+description: ' Use rails generator to install and setup rubygems such as rspec, devise,
+  omniauth-facebook...etc. Also can use in exists projects. '
 email: marsz@5fpro.com
 executables: []
 extensions: []
@@ -114,7 +107,7 @@ files:
 - lib/generators/venus/omniauth/templates/migrations.rb.erb
 - lib/generators/venus/omniauth/templates/omniauth.rb.erb
 - lib/generators/venus/omniauth/templates/omniauth_callbacks_controller.rb.erb
-- lib/generators/venus/omniauth/templates/omniauthable.rb
+- lib/generators/venus/omniauth/templates/omniauthable.rb.erb
 - lib/generators/venus/omniauth/templates/routes.erb
 - lib/generators/venus/omniauth/templates/setting.yml.erb
 - lib/generators/venus/omniauth/templates/user.erb
@@ -144,27 +137,26 @@ files:
 - venus.gemspec
 homepage: https://github.com/marsz/venus
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Use rails generator to install and setup rubygems such as rspec, devise,
   omniauth-facebook...etc. Also can use in exists projects.
 test_files: []