hubstats 0.4.4 → 0.5.0

data/spec/models/hubstats/user_spec.rb

@@ -18,5 +18,31 @@ module Hubstats
       expect(user2.login).to eq("johndoe")
       expect(user1.login).not_to eq("johnapplesdeed")
     end
+
+    it 'should find the team that this user belongs to' do
+      team = create(:team)
+      user = create(:user, login: 'janedoe', id: 11)
+      team.users << user
+      expect(user.login).to eq('janedoe')
+      expect(user.team).to eq(team)
+    end
+
+    it 'should find first team that this user belongs to' do
+      team1 = create(:team, name: "sad")
+      team2 = create(:team, name: "happy")
+      user = create(:user, login: 'janedoe', id: 11)
+      team1.users << user
+      team2.users << user
+      expect(user.login).to eq('janedoe')
+      expect(user.team).to eq(team1)
+    end
+
+    it 'should return no team if the hubstats bool is false' do
+      team = create(:team, hubstats: false)
+      user = create(:user, login: 'janedoe', id: 11)
+      team.users << user
+      expect(user.login).to eq('janedoe')
+      expect(user.team).to eq(nil)
+    end
   end
 end

data/test/dummy/config/initializers/octokit_patch.rb

@@ -0,0 +1,3 @@
+Octokit.configure do |c|
+  c.connection_options[:ssl] = { :version => :TLSv1 }
+end

data/test/dummy/db/schema.rb

@@ -11,16 +11,12 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150706210701) do
+ActiveRecord::Schema.define(:version => 20150713185100) do
 
   create_table "hubstats_comments", :force => true do |t|
-    t.string   "kind"
-    t.integer  "user_id"
-    t.integer  "pull_request_id"
-    t.integer  "repo_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "body"
+    t.string   "html_url"
+    t.string   "url"
+    t.string   "pull_request_url"
     t.string   "diff_hunk"
     t.integer  "path"
     t.integer  "position"
@@ -28,9 +24,13 @@ ActiveRecord::Schema.define(:version => 20150706210701) do
     t.string   "line"
     t.string   "commit_id"
     t.string   "original_commit_id"
-    t.string   "html_url"
-    t.string   "url"
-    t.string   "pull_request_url"
+    t.string   "body"
+    t.string   "kind"
+    t.integer  "user_id"
+    t.integer  "pull_request_id"
+    t.integer  "repo_id"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
   end
 
   add_index "hubstats_comments", ["pull_request_id"], :name => "index_hubstats_comments_on_pull_request_id"
@@ -55,17 +55,6 @@ ActiveRecord::Schema.define(:version => 20150706210701) do
   end
 
   create_table "hubstats_pull_requests", :force => true do |t|
-    t.integer  "number"
-    t.integer  "user_id"
-    t.integer  "repo_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "closed_at"
-    t.integer  "additions"
-    t.integer  "deletions"
-    t.integer  "comments"
-    t.integer  "commits"
-    t.integer  "changed_files"
     t.string   "url"
     t.string   "html_url"
     t.string   "diff_url"
@@ -76,39 +65,37 @@ ActiveRecord::Schema.define(:version => 20150706210701) do
     t.string   "review_comment_url"
     t.string   "comments_url"
     t.string   "statuses_url"
+    t.integer  "number"
     t.string   "state"
     t.string   "title"
     t.string   "body"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
+    t.datetime "closed_at"
     t.string   "merge_commit_sha"
     t.string   "merged"
     t.string   "mergeable"
+    t.integer  "comments"
+    t.integer  "commits"
+    t.integer  "additions"
+    t.integer  "deletions"
+    t.integer  "changed_files"
+    t.integer  "user_id"
+    t.integer  "repo_id"
     t.integer  "deploy_id"
     t.integer  "merged_by"
     t.datetime "merged_at"
+    t.integer  "team_id"
   end
 
   add_index "hubstats_pull_requests", ["repo_id"], :name => "index_hubstats_pull_requests_on_repo_id"
   add_index "hubstats_pull_requests", ["user_id"], :name => "index_hubstats_pull_requests_on_user_id"
 
   create_table "hubstats_repos", :force => true do |t|
-    t.integer  "owner_id"
     t.string   "name"
     t.string   "full_name"
-    t.datetime "pushed_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
     t.string   "homepage"
     t.string   "language"
-    t.integer  "forks_count"
-    t.integer  "stargazers_count"
-    t.integer  "watches_count"
-    t.integer  "size"
-    t.integer  "open_issues_count"
-    t.boolean  "has_issues"
-    t.boolean  "has_wiki"
-    t.boolean  "has_downloads"
-    t.boolean  "private"
-    t.boolean  "fork"
     t.string   "description"
     t.string   "default_branch"
     t.string   "url"
@@ -128,16 +115,36 @@ ActiveRecord::Schema.define(:version => 20150706210701) do
     t.string   "issues_url"
     t.string   "pulls_url"
     t.string   "labels_url"
+    t.integer  "forks_count"
+    t.integer  "stargazers_count"
+    t.integer  "watches_count"
+    t.integer  "size"
+    t.integer  "open_issues_count"
+    t.boolean  "has_issues"
+    t.boolean  "has_wiki"
+    t.boolean  "has_downloads"
+    t.boolean  "private"
+    t.boolean  "fork"
+    t.datetime "pushed_at"
+    t.datetime "created_at",        :null => false
+    t.datetime "updated_at",        :null => false
+    t.integer  "owner_id"
   end
 
   add_index "hubstats_repos", ["owner_id"], :name => "index_hubstats_repos_on_owner_id"
 
+  create_table "hubstats_teams", :force => true do |t|
+    t.string  "name"
+    t.boolean "hubstats"
+  end
+
+  create_table "hubstats_teams_users", :force => true do |t|
+    t.integer "user_id"
+    t.integer "team_id"
+  end
+
   create_table "hubstats_users", :force => true do |t|
     t.string   "login"
-    t.string   "role"
-    t.boolean  "site_admin"
-    t.datetime "created_at",          :null => false
-    t.datetime "updated_at",          :null => false
     t.string   "avatar_url"
     t.string   "gravatar_id"
     t.string   "url"
@@ -151,6 +158,10 @@ ActiveRecord::Schema.define(:version => 20150706210701) do
     t.string   "repos_url"
     t.string   "events_url"
     t.string   "received_events_url"
+    t.string   "role"
+    t.boolean  "site_admin"
+    t.datetime "created_at",          :null => false
+    t.datetime "updated_at",          :null => false
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubstats
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Elliot Hursh
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.18
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: will_paginate-bootstrap
   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
@@ -71,72 +71,86 @@ dependencies:
   name: bootstrap-datepicker-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.beta
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.4'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Github Statistics
 email:
 - elliothursh@gmail.com
@@ -145,12 +159,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .codeclimate.yml
-- .gitignore
-- .octopolo.yml
-- .rspec
-- .soyuz.yml
-- .travis.yml
+- ".codeclimate.yml"
+- ".gitignore"
+- ".octopolo.yml"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".soyuz.yml"
+- ".travis.yml"
 - CHANGELOG.markdown
 - Gemfile
 - MIT-LICENSE
@@ -183,6 +199,7 @@ files:
 - app/controllers/hubstats/events_controller.rb
 - app/controllers/hubstats/pull_requests_controller.rb
 - app/controllers/hubstats/repos_controller.rb
+- app/controllers/hubstats/teams_controller.rb
 - app/controllers/hubstats/users_controller.rb
 - app/helpers/hubstats/application_helper.rb
 - app/helpers/hubstats/events_helper.rb
@@ -194,6 +211,7 @@ files:
 - app/models/hubstats/label.rb
 - app/models/hubstats/pull_request.rb
 - app/models/hubstats/repo.rb
+- app/models/hubstats/team.rb
 - app/models/hubstats/user.rb
 - app/views/hubstats/deploys/index.html.erb
 - app/views/hubstats/deploys/show.html.erb
@@ -208,6 +226,7 @@ files:
 - app/views/hubstats/partials/_quick_addition_stats.html.erb
 - app/views/hubstats/partials/_quick_stats.html.erb
 - app/views/hubstats/partials/_repo.html.erb
+- app/views/hubstats/partials/_team.html.erb
 - app/views/hubstats/partials/_user-condensed.html.erb
 - app/views/hubstats/partials/_user.html.erb
 - app/views/hubstats/pull_requests/index.html.erb
@@ -224,8 +243,11 @@ files:
 - app/views/hubstats/tables/_pulls.html.erb
 - app/views/hubstats/tables/_repos-condensed.html.erb
 - app/views/hubstats/tables/_repos.html.erb
+- app/views/hubstats/tables/_teams.html.erb
 - app/views/hubstats/tables/_users-condensed.html.erb
 - app/views/hubstats/tables/_users.html.erb
+- app/views/hubstats/teams/index.html.erb
+- app/views/hubstats/teams/show.html.erb
 - app/views/hubstats/users/index.html.erb
 - app/views/hubstats/users/show.html.erb
 - app/views/layouts/hubstats/application.html.erb
@@ -241,6 +263,9 @@ files:
 - db/migrate/20150605184015_add_user_id_delete_deployed_by_to_deploy.rb
 - db/migrate/20150605190549_add_merged_by_column_to_pull_request.rb
 - db/migrate/20150625164705_make_merged_at_datetime.rb
+- db/migrate/20150706204910_create_hubstats_teams.rb
+- db/migrate/20150706205049_create_hubstats_teams_users.rb
+- db/migrate/20150713185013_add_team_id_to_prs.rb
 - db/seeds.rb
 - hubstats.gemspec
 - lib/generators/hubstats/install_generator.rb
@@ -259,11 +284,13 @@ files:
 - spec/controllers/hubstats/events_controller_spec.rb
 - spec/controllers/hubstats/pull_requests_controller_spec.rb
 - spec/controllers/hubstats/repos_controller_spec.rb
+- spec/controllers/hubstats/teams_controller_spec.rb
 - spec/controllers/hubstats/users_controller_spec.rb
 - spec/factories/comment.rb
 - spec/factories/deploys.rb
 - spec/factories/pull_requests.rb
 - spec/factories/repo.rb
+- spec/factories/teams.rb
 - spec/factories/users.rb
 - spec/helpers/hubstats/events_helper_spec.rb
 - spec/helpers/hubstats/pull_requests_helper_spec.rb
@@ -277,6 +304,7 @@ files:
 - spec/models/hubstats/label_spec.rb
 - spec/models/hubstats/pull_request_spec.rb
 - spec/models/hubstats/repo_spec.rb
+- spec/models/hubstats/team_spec.rb
 - spec/models/hubstats/user_spec.rb
 - spec/spec_helper.rb
 - test/dummy/README.rdoc
@@ -297,6 +325,7 @@ files:
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/octokit_patch.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
@@ -324,17 +353,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.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Github Statistics
@@ -343,11 +372,13 @@ test_files:
 - spec/controllers/hubstats/events_controller_spec.rb
 - spec/controllers/hubstats/pull_requests_controller_spec.rb
 - spec/controllers/hubstats/repos_controller_spec.rb
+- spec/controllers/hubstats/teams_controller_spec.rb
 - spec/controllers/hubstats/users_controller_spec.rb
 - spec/factories/comment.rb
 - spec/factories/deploys.rb
 - spec/factories/pull_requests.rb
 - spec/factories/repo.rb
+- spec/factories/teams.rb
 - spec/factories/users.rb
 - spec/helpers/hubstats/events_helper_spec.rb
 - spec/helpers/hubstats/pull_requests_helper_spec.rb
@@ -361,6 +392,7 @@ test_files:
 - spec/models/hubstats/label_spec.rb
 - spec/models/hubstats/pull_request_spec.rb
 - spec/models/hubstats/repo_spec.rb
+- spec/models/hubstats/team_spec.rb
 - spec/models/hubstats/user_spec.rb
 - spec/spec_helper.rb
 - test/dummy/README.rdoc
@@ -381,6 +413,7 @@ test_files:
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/octokit_patch.rb
 - test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb