teachers_pet 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 237378cc3ef99f43b205dd00666e73b31d0fd08c
-  data.tar.gz: 6ae28a5c307127776aef86f6f40570fa38b6603f
+  metadata.gz: c0fcff1514b6ed632b6a3ddf6bb6beded7b83228
+  data.tar.gz: 9a15cdd20dd90ff8e81911f428c7fb07d8df8430
 SHA512:
-  metadata.gz: 6045ed09c10c41e2167b5f87223d2a46b91e99d2473f73d1b0bff31e17683a830328e7833596d6d2aace1c4e859049b5d66e42a6d961a19bbf8260e5a02ad3ef
-  data.tar.gz: b23a23912a4c70d10a47d2092693d19272173ea1a3cc65fd7f352d046ec5b119fcc4fe49976550cd2d5fc4e6e95c19c426d4e1fefa4299d11628649b5501cd3b
+  metadata.gz: ee50dec19e0eabd794dd34130b3e0c4861f0cd27d91e3e6c74468746f30db10e34151a145e93d9fed44febd0cfb0a90815e224a3140c67494ad7480afc4416c6
+  data.tar.gz: d8a71c8d9cc31230de1617a300844cc32118621460f87a3d12f9a00fb6b1063c85835aa99ac77aa2f8d0b274ffdc73460ba5c629c4c4a5f77aded29b5cd01e1e

data/lib/teachers_pet/actions/add_to_team.rb

@@ -12,14 +12,14 @@ module TeachersPet
         teams_by_name[self.team_name] || self.client.create_team(org_login, team_name)
       end
 
-      def add_members_to_owners
+      def add_members
         member_list = self.read_members_file
         self.client.add_users_to_team(self.options[:organization], self.team, member_list)
       end
 
       def run
         self.init_client
-        self.add_members_to_owners
+        self.add_members
       end
     end
   end

data/lib/teachers_pet/actions/base.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/hash/keys'
+require 'io/console'
 require 'octokit'
 require_relative File.join('..', 'configuration')
 
@@ -21,9 +22,19 @@ module TeachersPet
         }
 
         if self.options[:token]
-          opts[:access_token] = self.options[:token]
+          if self.options[:token].eql?('token')
+            print 'Please enter your GitHub token: '
+            opts[:access_token] = STDIN.noecho(&:gets).chomp
+          else
+            opts[:access_token] = self.options[:token]
+          end
         elsif self.options[:password]
-          opts[:password] = self.options[:password]
+          if self.options[:password].eql?('password')
+            print 'Please enter your GitHub password: '
+            opts[:password] = STDIN.noecho(&:gets).chomp
+          else
+            opts[:password] = self.options[:password]
+          end
         else
           raise Thor::RequiredArgumentMissingError.new("No value provided for option --password or --token")
         end
@@ -79,6 +90,10 @@ module TeachersPet
         puts "Loading members to add:"
         read_file(file).keys
       end
+
+      def execute(command)
+        return system(command)
+      end
     end
   end
 end

data/lib/teachers_pet/configuration.rb

@@ -11,9 +11,9 @@ module TeachersPet
       @@API_ENDPOINT
     end
 
-    # For github.com: https://www.github.com/'
+    # For github.com: https://github.com/'
     # For GitHub Enterprise: ''https://yourServer.com/'
-    @@WEB_ENDPOINT = 'https://www.github.com/'
+    @@WEB_ENDPOINT = 'https://github.com/'
 
     def self.webEndpoint
       @@WEB_ENDPOINT

data/lib/teachers_pet/version.rb

@@ -1,3 +1,3 @@
 module TeachersPet
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/spec/actions/base_spec.rb

@@ -18,6 +18,18 @@ describe TeachersPet::Actions::Base do
       action = TeachersPet::Actions::Base.new(token: 'abc123')
       expect(action.octokit_config[:access_token]).to eq('abc123')
     end
+
+    it "waits for a password if the password flag is passed without any arguments" do
+      action = TeachersPet::Actions::Base.new(password: 'password')
+      STDIN.stub(:gets).and_return('abc123')
+      expect(action.octokit_config[:password]).to eq('abc123')
+    end
+
+    it "waits for a token if the token flag is passed without any arguments" do
+      action = TeachersPet::Actions::Base.new(token: 'token')
+      STDIN.stub(:gets).and_return('abc123')
+      expect(action.octokit_config[:access_token]).to eq('abc123')
+    end
   end
 
   describe '#read_file' do

data/spec/commands/add_collaborators_spec.rb

@@ -24,7 +24,7 @@ describe 'add_collaborators' do
         'password' => 'abc123',
         'repository' => 'testorg/testrepo',
         'username' => ENV['USER'],
-        'web' => 'https://www.github.com/'
+        'web' => 'https://github.com/'
       )
 
       teachers_pet(:add_collaborators,

data/spec/commands/clone_repos_spec.rb

@@ -13,7 +13,7 @@ describe 'clone_repos' do
     request_stubs << stub_get_json('https://testteacher:abc123@api.github.com/orgs/testorg/teams?per_page=100', student_teams)
     student_usernames.each do |username|
       request_stubs << stub_get_json("https://testteacher:abc123@api.github.com/repos/testorg/#{username}-testrepo", {})
-      expect_any_instance_of(TeachersPet::Actions::CloneRepos).to receive(:execute).with("git clone https://www.github.com/testorg/#{username}-testrepo.git").once
+      expect_any_instance_of(TeachersPet::Actions::CloneRepos).to receive(:execute).with("git clone https://github.com/testorg/#{username}-testrepo.git").once
     end
 
     teachers_pet(:clone_repos,

data/spec/commands/forks_spec.rb

@@ -23,7 +23,7 @@ describe 'forks' do
         'password' => 'abc123',
         'repository' => 'testorg/testrepo',
         'username' => ENV['USER'],
-        'web' => 'https://www.github.com/'
+        'web' => 'https://github.com/'
       )
       teachers_pet(:forks, repository: 'testorg/testrepo', password: 'abc123')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teachers_pet
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - John Britton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Command line tools to help teachers use GitHub in their classrooms