teachers_pet 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 293791f01ea48c84167c90902b2c746751617ac1
-  data.tar.gz: 33d7f890862a1d527fd265e7882b690807eb9300
+  metadata.gz: 813064fc57381e80d03d7c3743cf2b77a295e50c
+  data.tar.gz: 8209de5e067d2ae7c97259a9d991dfd49eba4058
 SHA512:
-  metadata.gz: 0af8b9fb762e2d8e895bfd6e821392205ef3e789c9f911ad12df226785397b10b52d7cb7b196b050308e817493844807f368378dcf251dc0592cc852ce81e535
-  data.tar.gz: 76906e2fb2c0e443e21d6b7f9ccd7f493796a1eddaf90aaa397c825637af2052c79b65103ad9538c4d593ab164ac5d482d4fa32a778e8c75a7eeb941e8aa4c87
+  metadata.gz: 41e6db46507899a90c0aff59d168b2c4f8091c43fd76fdd5580bddbea563a56b18f353013ab46310ea94fdbc8e50dcfe41210def8942a9eba9beaae21f0b2579
+  data.tar.gz: 96e44bd2c0c615688c21803076cc4640dfc8de7d830a75d1c2d63ac025c8bc90e0c42621d73b509187109aac8ace30405ac134b42934a636ac531e280d4c85be

data/lib/teachers_pet/actions/add_to_team.rb

@@ -2,24 +2,25 @@ module TeachersPet
   module Actions
     class AddToTeam < Base
       def read_members_file
-        file = self.members
+        file = self.options[:members]
         puts "Loading members to add:"
         read_file(file).keys
       end
 
       def team_name
-        file = self.members
+        file = self.options[:members]
         File.basename(file, File.extname(file))
       end
 
       def team
-        teams_by_name = self.client.existing_teams_by_name(self.organization)
-        teams_by_name[self.team_name] || self.client.create_team(self.organization, team_name)
+        org_login = self.options[:organization]
+        teams_by_name = self.client.existing_teams_by_name(org_login)
+        teams_by_name[self.team_name] || self.client.create_team(org_login, team_name)
       end
 
       def add_members_to_owners
         member_list = self.read_members_file
-        self.client.add_users_to_team(organization, self.team, member_list)
+        self.client.add_users_to_team(self.options[:organization], self.team, member_list)
       end
 
       def run

data/lib/teachers_pet/actions/base.rb

@@ -11,29 +11,21 @@ module TeachersPet
         @options = opts.symbolize_keys
       end
 
-      def method_missing(meth, *args, &block)
-        # Support boolean options ending, by calling them with '?' at the end
-        key = meth.to_s.sub(/\?\z/, '').to_sym
-        if self.options.has_key?(key)
-          self.options[key]
-        else
-          super
-        end
-      end
-
       def octokit_config
         opts = {
-          api_endpoint: self.api,
-          web_endpoint: self.web,
-          login: self.username,
+          api_endpoint: self.options[:api],
+          web_endpoint: self.options[:web],
+          login: self.options[:username],
           # Organizations can get big, pull in all pages
           auto_paginate: true
         }
 
         if self.options[:token]
-          opts[:access_token] = self.token
+          opts[:access_token] = self.options[:token]
+        elsif self.options[:password]
+          opts[:password] = self.options[:password]
         else
-          opts[:password] = self.password
+          raise Thor::RequiredArgumentMissingError.new("No value provided for option --password or --token")
         end
 
         opts
@@ -77,7 +69,7 @@ module TeachersPet
       end
 
       def read_students_file
-        student_file = self.students
+        student_file = self.options[:students]
         puts "Loading students:"
         read_file(student_file)
       end

data/lib/teachers_pet/actions/clone_repos.rb

@@ -2,8 +2,8 @@ module TeachersPet
   module Actions
     class CloneRepos < Base
       def read_info
-        @repository = self.repository
-        @organization = self.organization
+        @repository = self.options[:repository]
+        @organization = self.options[:organization]
       end
 
       def load_files
@@ -11,7 +11,7 @@ module TeachersPet
       end
 
       def get_clone_method
-        self.clone_method
+        self.options[:clone_method]
       end
 
       def create
@@ -40,11 +40,11 @@ module TeachersPet
             next
           end
 
-
-          sshEndpoint = self.web.gsub("https://","git@").gsub("/",":")
+          web = self.options[:web]
+          sshEndpoint = web.gsub("https://","git@").gsub("/",":")
           command = "git clone #{sshEndpoint}#{@organization}/#{repo_name}.git"
           if cloneMethod.eql?('https')
-            command = "git clone #{self.web}#{@organization}/#{repo_name}.git"
+            command = "git clone #{web}#{@organization}/#{repo_name}.git"
           end
           puts " --> Cloning: '#{command}'"
           self.execute(command)

data/lib/teachers_pet/actions/create_repos.rb

@@ -2,9 +2,9 @@ module TeachersPet
   module Actions
     class CreateRepos < Base
       def read_info
-        @repository = self.repository
-        @organization = self.organization
-        @public_repos = self.public?
+        @repository = self.options[:repository]
+        @organization = self.options[:organization]
+        @public_repos = self.options[:public]
       end
 
       def load_files

data/lib/teachers_pet/actions/create_student_teams.rb

@@ -2,7 +2,8 @@ module TeachersPet
   module Actions
     class CreateStudentTeams < Base
       def create_student_teams
-        teams_by_name = self.client.existing_teams_by_name(self.organization)
+        org_login = self.options[:organization]
+        teams_by_name = self.client.existing_teams_by_name(org_login)
 
         students_list = self.read_students_file
         students_list.each do |key, value|
@@ -18,11 +19,11 @@ module TeachersPet
 
           team = teams_by_name[team_name]
           if team
-            puts "Team @#{organization}/#{team_name} already exists."
+            puts "Team @#{org_login}/#{team_name} already exists."
           else
-            team = self.client.create_team(organization, team_name)
+            team = self.client.create_team(org_login, team_name)
           end
-          self.client.add_users_to_team(organization, team, usernames)
+          self.client.add_users_to_team(org_login, team, usernames)
         end
       end
 

data/lib/teachers_pet/actions/fork_collab.rb

@@ -1,6 +1,10 @@
 module TeachersPet
   module Actions
     class ForkCollab < Base
+      def repository
+        self.options[:repository]
+      end
+
       def get_forks
         self.client.forks(self.repository)
       end
@@ -11,7 +15,7 @@ module TeachersPet
         forks.each do |fork|
           login = fork.owner.login
           if fork.owner.type == "User"
-            unless self.dry_run?
+            unless self.options[:dry_run]
               result = self.client.add_collab(self.repository, login)
             end
             puts "#{login} - #{result}"

data/lib/teachers_pet/actions/open_issue.rb

@@ -2,16 +2,16 @@ module TeachersPet
   module Actions
     class OpenIssue < Base
       def read_info
-        @repository = self.repository
-        @organization = self.organization
+        @repository = self.options[:repository]
+        @organization = self.options[:organization]
 
         @issue = {
-          title: self.title,
+          title: self.options[:title],
           options: {
-            labels: self.labels
+            labels: self.options[:labels]
           }
         }
-        @issue_file = self.body
+        @issue_file = self.options[:body]
       end
 
       def load_files

data/lib/teachers_pet/actions/push_files.rb

@@ -2,9 +2,9 @@ module TeachersPet
   module Actions
     class PushFiles < Base
       def read_info
-        @repository = self.repository
-        @organization = self.organization
-        @sshEndpoint = self.ssh
+        @repository = self.options[:repository]
+        @organization = self.options[:organization]
+        @sshEndpoint = self.options[:ssh]
       end
 
       def load_files

data/lib/teachers_pet/version.rb

@@ -1,3 +1,3 @@
 module TeachersPet
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/actions/base_spec.rb

@@ -1,6 +1,25 @@
 require 'spec_helper'
 
 describe TeachersPet::Actions::Base do
+  describe '#octokit_config' do
+    it "complains if the password and token are missing" do
+      action = TeachersPet::Actions::Base.new
+      expect {
+        action.octokit_config
+      }.to raise_error(Thor::RequiredArgumentMissingError, /--password.+--token/)
+    end
+
+    it "uses the password if provided" do
+      action = TeachersPet::Actions::Base.new(password: 'abc123')
+      expect(action.octokit_config[:password]).to eq('abc123')
+    end
+
+    it "uses the token if provided" do
+      action = TeachersPet::Actions::Base.new(token: 'abc123')
+      expect(action.octokit_config[:access_token]).to eq('abc123')
+    end
+  end
+
   describe '#read_file' do
     it "returns a hash of usernames by team name" do
       action = TeachersPet::Actions::Base.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teachers_pet
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - John Britton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport