work_together 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71b53e8b8573dd1d69a3aaa584a97c01e6d9c66b
-  data.tar.gz: 0343262c8259704b8c91f17a7a9707fd67a0ccfb
+  metadata.gz: a6f2fb796937e7f37d46abee6d075df3d25550d6
+  data.tar.gz: a9bede98d7bc13351dc99427d79935b5f30b8ae7
 SHA512:
-  metadata.gz: c03983fb0706c03d71f11abf26a98024ea279e08b7f2ea29d24f4ac15412d13c7882d91ce19a80a6d0b6f8597c26e9e6c337b93b8106ff641f389bec9abc2adc
-  data.tar.gz: f8f3416e7b5e634e3e9a0329f7c5fb75e211db1c9ea2fa63cd718ae1e6b015cafdabd10756bc6bd5456eb4106419b5dca8727d2e71355c00d71a608cbd92c17a
+  metadata.gz: 97a17e65266a397f0f303d48f36af43968164d2ba91683ab5d8f648eeb50dc025122ccf752e129b9284fac69522058609456394e81d13602815c6e124363e53b
+  data.tar.gz: b398ffa81c018727b8094ba4ee283a07b4d049c27a3f0a75e0a71772e65147ed4b5f3607418af5f4c29516c6ff602e0701a35af600584d9f14d3eb2f451d750b

data/bin/work-together

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
-require 'pry'
+
 require 'csv'
 require_relative '../lib/work_together.rb'
 
 if ARGV.length >= 3
-  WorkTogether.new(ARGV[2]).generate_togetherness(ARGV)
+  WorkTogether::Generator.new(ARGV[2]).generate_togetherness(ARGV)
 elsif ARGV.include?("--help")
-  WorkTogether.new.help
+  WorkTogether::Generator.new.help
 else
   puts "please use work-together --help for a list of options"
 end

data/lib/work_together/parser.rb

@@ -1,19 +1,9 @@
 require 'csv'
-require_relative './student.rb'
 class Parser
 
-  def self.parse_and_make_students(file)
-    CSV.parse(file, headers: true).each do |row|
-      make_student_with_attributes(row.to_h) unless row[0] == "first_name" || row[0].nil?
-    end
-  end
-
-  def self.make_student_with_attributes(row)
-    row.delete_if {|k, v| !Student.instance_methods.include?(k.to_sym)}
-    Student.new.tap do |student|
-      row.each do |attribute, value|
-        student.public_send("#{attribute}=", value)
-      end
+  def self.parse_students(file)
+    CSV.parse(file, headers: true).map do |row|
+      row
     end
   end
 end

data/lib/work_together/version.rb

@@ -1,3 +1,3 @@
-class WorkTogether
-  VERSION = "0.5.0"
+module WorkTogether
+  VERSION = "0.6.0"
 end

data/lib/work_together.rb

@@ -1,96 +1,131 @@
 require_relative './work_together/version'
-require_relative './work_together/student.rb'
 require_relative './work_together/parser.rb'
 require_relative './work_together/table.rb'
 require_relative './work_together/pair_maker.rb'
 require_relative './work_together/learn_proxy.rb'
-require 'pry'
 require 'colorize'
 
-class WorkTogether
+module WorkTogether
 
-  attr_accessor :batch_id, :client, :pair_maker, :keys, :students
+  class Generator
 
-  def initialize(batch_id)
-    @batch_id = batch_id
-    @pair_maker = PairMaker.new
-  end
+    attr_accessor :batch_id, :client, :pair_maker, :keys
 
+    def initialize(batch_id)
+      @batch_id = batch_id
+      @pair_maker = PairMaker.new
+    end
 
-  def generate_togetherness(options, quiet=nil)
-    make_batch
-    make_groups(options, quiet=quiet)
-  end
 
-  def make_batch
-    configure_client
-    get_and_parse_csv
-    @students = Student.all
-  end
+    def generate_togetherness(options, quiet=nil)
+      make_batch
+      make_groups(options, quiet=quiet)
+    end
 
-  def make_groups(options, quiet)
-    flag = options[1][2..-1]
-    if options.include?("pairs")
-      pair_maker.public_send("make_pairs_#{flag}", self.students)
-    elsif options.include?("tables")
-      pair_maker.public_send("make_tables_#{flag}", self.students)
-    elsif options.include?("--help")
-      help
-    else
-      puts "Please enter a valid command. Type work-together --help for more."
+    def make_batch
+      configure_client
+      student_data = get_and_parse_csv
+      Student.generate_from_data(student_data)
+    end
+
+    def make_groups(options, quiet)
+      flag = options[1][2..-1]
+      if options.include?("pairs")
+        pair_maker.public_send("make_pairs_#{flag}", Student.all)
+      elsif options.include?("tables")
+        pair_maker.public_send("make_tables_#{flag}", Student.all)
+      elsif options.include?("--help")
+        help
+      else
+        puts "Please enter a valid command. Type work-together --help for more."
+      end
+      display_tables if !quiet && Table.all.length > 0
     end
-    display_tables if !quiet && Table.all.length > 0
-  end
 
-  private 
+    private 
 
-    def display_tables
-      Table.all.each_with_index do |table, i|
-          puts "Group #{i + 1}:".colorize(:blue)
-          table.students.each do |student|
-            puts student.name.colorize(:light_blue)
+      def display_tables
+        Table.all.each_with_index do |table, i|
+            puts "Group #{i + 1}:".colorize(:blue)
+            table.students.each do |student|
+              puts student.name.colorize(:light_blue)
+            end
+            puts "-------------------".colorize(:blue)
           end
-          puts "-------------------".colorize(:blue)
-        end
-    end
+      end
+
+      def help
+        puts "Available commands:"
+          puts "work-together pairs --random batch-number    generate pairs randomly"
+          puts "work-together pairs --progress batch-number  generate pairs grouped by similar progress"
+          puts "work-together pairs --mindful batch-number   generate pairs with one person who is more advanced, one person less advanced"
+          puts "work-together tables --random batch-number   generate tables randomly"
+          puts "work-together tables --progress batch-number   generate tables grouped by similar progress"
+          puts "work-together tables --mindful batch-number   generate tables with some people more advanced, some less"
+      end
+
+      def configure_client
+        configure_keys
+        credentials = LearnProxy::Credentials.new(self.keys['GITHUB_USERNAME'],  self.keys['GITHUB_PASSWORD'])
+        @client = LearnProxy::Client.new(credentials)
+      end
+
+      def configure_keys
+        @keys = YAML.load_file(File.expand_path(File.dirname(__FILE__)) + '/work_together/client.yml')
+        get_and_store_keys unless @keys
+      end
+
+      def get_and_store_keys
+        puts "Please enter your github username:"
+        username = STDIN.gets.chomp
+        puts "Please enter your github password:"
+        password = STDIN.gets.chomp
+        @keys = {"GITHUB_USERNAME" => username, "GITHUB_PASSWORD" => password}
+        File.open(File.expand_path(File.dirname(__FILE__)) + '/work_together/client.yml', 'w') {|f| f.write self.keys.to_yaml } 
+      end
+
+      def get_roster
+        self.client.csv_for(self.batch_id)
+      end
+
+      def get_and_parse_csv
+        roster = get_roster
+        Parser.parse_students(roster)
+      end
+  end
 
-    def help
-      puts "Available commands:"
-        puts "work-together pairs --random batch-number    generate pairs randomly"
-        puts "work-together pairs --progress batch-number  generate pairs grouped by similar progress"
-        puts "work-together pairs --mindful batch-number   generate pairs with one person who is more advanced, one person less advanced"
-        puts "work-together tables --random batch-number   generate tables randomly"
-        puts "work-together tables --progress batch-number   generate tables grouped by similar progress"
-        puts "work-together tables --mindful batch-number   generate tables with some people more advanced, some less"
-    end
+  class Student
+    @@all = []
 
-    def configure_client
-      configure_keys
-      credentials = LearnProxy::Credentials.new(self.keys['GITHUB_USERNAME'],  self.keys['GITHUB_PASSWORD'])
-      @client = LearnProxy::Client.new(credentials)
+    attr_accessor :first_name, :last_name, :completion, :github_username, :email, :active_track
+
+    def initialize
+      @@all << self
     end
 
-    def configure_keys
-      @keys = YAML.load_file(File.expand_path(File.dirname(__FILE__)) + '/work_together/client.yml')
-      get_and_store_keys unless @keys
+    def self.all
+      @@all 
     end
 
-    def get_and_store_keys
-      puts "Please enter your github username:"
-      username = STDIN.gets.chomp
-      puts "Please enter your github password:"
-      password = STDIN.gets.chomp
-      @keys = {"GITHUB_USERNAME" => username, "GITHUB_PASSWORD" => password}
-      File.open(File.expand_path(File.dirname(__FILE__)) + '/work_together/client.yml', 'w') {|f| f.write self.keys.to_yaml } 
+    def name
+      "#{first_name} #{last_name}"
     end
 
-    def get_roster
-      self.client.csv_for(self.batch_id)
+    def progress
+      self.completion
     end
 
-    def get_and_parse_csv
-      roster = get_roster
-      Parser.parse_and_make_students(roster)
+    def self.generate_from_data(data)
+      data.each do |student_hash|
+        student_hash.delete_if {|attribute, value| !Student.instance_methods.include?(attribute.to_sym)}
+        self.new.tap do |student|
+          student_hash.each do |attribute, value|
+            student.public_send("#{attribute}=", value)
+          end
+        end
+      end
     end
+    
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: work_together
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sophie DeBenedetto
@@ -122,7 +122,6 @@ files:
 - lib/work_together/learn_proxy.rb
 - lib/work_together/pair_maker.rb
 - lib/work_together/parser.rb
-- lib/work_together/student.rb
 - lib/work_together/table.rb
 - lib/work_together/version.rb
 homepage: https://github.com/SophieDeBenedetto/work-together

data/lib/work_together/student.rb

@@ -1,23 +0,0 @@
-class Student
-
-  @@all = []
-
-  attr_accessor :first_name, :last_name, :completion, :github_username, :email, :active_track
-
-  def initialize
-    @@all << self
-  end
-
-  def self.all
-    @@all 
-  end
-
-  def name
-    "#{first_name} #{last_name}"
-  end
-
-  def progress
-    self.completion
-  end
-  
-end