daigaku 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b133fa5493044ca1533d21e52864d9603097e493
-  data.tar.gz: ab071c41328776194b3020be3d5f51150b1493d5
+  metadata.gz: cfaf629e68b2b89a328f0d06a4307e5a900388b3
+  data.tar.gz: 7269916d126c5d850b2014ff2f8c79b58187a4e9
 SHA512:
-  metadata.gz: e8fdc1c221006d16e99b97e458878c2d2564ef2c16dd7b9f0080fd76b58b7945d94946df9e6d885ca9fe81e5e6bd2e8a263e5f7d06ef7d95432d7fdcfa2db30b
-  data.tar.gz: d84c449fcd505eacfb5c2c78bb1691d634963c74831af2360f3490ba24d46c4837b124b2c4f16f843385df769030de145e83fe97d83e7686ecc3b5ed64bf82ee
+  metadata.gz: 5e1763f2fffb8334776e79b1a2e80e3cc38cef0a515f18aa4020422aae6f1a2d651ba54a8ed058a601fd05ef1dbecde3c54b8ac54775379f55bbb89998c210c4
+  data.tar.gz: 33dda0a419b22b9c03af15d0223cd004da09f610ef7c1f2e665845faed7239ecf7ed9b10eb56c65060c9f88400a4d02c3958c094a5ba894ffaef6d6b3cf58992

data/.travis.yml

@@ -6,5 +6,9 @@ before_install:
 
 rvm:
   - 2.2.5
+  - 2.2.7
   - 2.3.0
-  - 2.3.1
+  - 2.3.4
+  - 2.4.0
+  - 2.4.1
+  - ruby-head

data/daigaku.gemspec

@@ -18,19 +18,18 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.5'
 
-  spec.add_runtime_dependency 'curses',        '~> 1.0'
-  spec.add_runtime_dependency 'activesupport', '~> 4.0'
+  spec.add_runtime_dependency 'curses',        '~> 1.2'
   spec.add_runtime_dependency 'rspec',         '~> 3.0'
-  spec.add_runtime_dependency 'thor',          '~> 0.19.1'
-  spec.add_runtime_dependency 'os',            '~> 0.9.6'
-  spec.add_runtime_dependency 'colorize',      '~> 0.7.5'
+  spec.add_runtime_dependency 'thor',          '~> 0.19'
+  spec.add_runtime_dependency 'os',            '~> 1.0'
+  spec.add_runtime_dependency 'colorize',      '~> 0.8'
   spec.add_runtime_dependency 'rubyzip',       '~> 1.0'
-  spec.add_runtime_dependency 'wisper',        '~> 1.6.1'
+  spec.add_runtime_dependency 'wisper',        '~> 2.0'
   spec.add_runtime_dependency 'quick_store',   '~> 0.2'
   spec.add_runtime_dependency 'code_breaker',  '~> 0.3'
 
-  spec.add_development_dependency 'bundler',     '~> 1.7'
-  spec.add_development_dependency 'rake',        '~> 10.0'
-  spec.add_development_dependency 'webmock',     '~> 1.20.4'
-  spec.add_development_dependency 'guard-rspec', '~> 4.5.0'
+  spec.add_development_dependency 'bundler',     '~> 1.14'
+  spec.add_development_dependency 'rake',        '~> 12.0'
+  spec.add_development_dependency 'webmock',     '~> 3.0'
+  spec.add_development_dependency 'guard-rspec', '~> 4.7'
 end

data/lib/daigaku/coloring.rb

@@ -1,37 +1,32 @@
 require 'curses'
-require 'active_support/concern'
 
 module Daigaku
   module Coloring
-    extend ActiveSupport::Concern
+    COLOR_TEXT           = Curses::COLOR_YELLOW  unless defined? COLOR_TEXT
+    COLOR_TEXT_EMPHASIZE = Curses::COLOR_CYAN    unless defined? COLOR_TEXT_EMPHASIZE
+    COLOR_HEADING        = Curses::COLOR_WHITE   unless defined? COLOR_HEADING
+    COLOR_RED            = Curses::COLOR_BLUE    unless defined? COLOR_RED
+    COLOR_GREEN          = Curses::COLOR_MAGENTA unless defined? COLOR_GREEN
+    COLOR_YELLOW         = Curses::COLOR_RED     unless defined? COLOR_YELLOW
 
-    included do
-      COLOR_TEXT           = Curses::COLOR_YELLOW  unless defined? COLOR_TEXT
-      COLOR_TEXT_EMPHASIZE = Curses::COLOR_CYAN    unless defined? COLOR_TEXT_EMPHASIZE
-      COLOR_HEADING        = Curses::COLOR_WHITE   unless defined? COLOR_HEADING
-      COLOR_RED            = Curses::COLOR_BLUE    unless defined? COLOR_RED
-      COLOR_GREEN          = Curses::COLOR_MAGENTA unless defined? COLOR_GREEN
-      COLOR_YELLOW         = Curses::COLOR_RED     unless defined? COLOR_YELLOW
+    BACKGROUND           = Curses::COLOR_WHITE   unless defined? BACKGROUND
+    FONT                 = Curses::COLOR_BLACK   unless defined? FONT
+    FONT_HEADING         = Curses::COLOR_MAGENTA unless defined? FONT_HEADING
+    FONT_EMPHASIZE       = Curses::COLOR_BLUE    unless defined? FONT_EMPHASIZE
+    RED                  = Curses::COLOR_RED     unless defined? RED
+    GREEN                = Curses::COLOR_GREEN   unless defined? GREEN
+    YELLOW               = Curses::COLOR_YELLOW  unless defined? YELLOW
 
-      BACKGROUND           = Curses::COLOR_WHITE   unless defined? BACKGROUND
-      FONT                 = Curses::COLOR_BLACK   unless defined? FONT
-      FONT_HEADING         = Curses::COLOR_MAGENTA unless defined? FONT_HEADING
-      FONT_EMPHASIZE       = Curses::COLOR_BLUE    unless defined? FONT_EMPHASIZE
-      RED                  = Curses::COLOR_RED     unless defined? RED
-      GREEN                = Curses::COLOR_GREEN   unless defined? GREEN
-      YELLOW               = Curses::COLOR_YELLOW  unless defined? YELLOW
+    protected
 
-      protected
-
-      def init_colors
-        Curses.start_color
-        Curses.init_pair(COLOR_TEXT, FONT, BACKGROUND)
-        Curses.init_pair(COLOR_TEXT_EMPHASIZE, FONT_EMPHASIZE, BACKGROUND)
-        Curses.init_pair(COLOR_HEADING, FONT_HEADING, BACKGROUND)
-        Curses.init_pair(COLOR_RED, RED, BACKGROUND)
-        Curses.init_pair(COLOR_GREEN, GREEN, BACKGROUND)
-        Curses.init_pair(COLOR_YELLOW, YELLOW, BACKGROUND)
-      end
+    def init_colors
+      Curses.start_color
+      Curses.init_pair(COLOR_TEXT, FONT, BACKGROUND)
+      Curses.init_pair(COLOR_TEXT_EMPHASIZE, FONT_EMPHASIZE, BACKGROUND)
+      Curses.init_pair(COLOR_HEADING, FONT_HEADING, BACKGROUND)
+      Curses.init_pair(COLOR_RED, RED, BACKGROUND)
+      Curses.init_pair(COLOR_GREEN, GREEN, BACKGROUND)
+      Curses.init_pair(COLOR_YELLOW, YELLOW, BACKGROUND)
     end
   end
 end

data/lib/daigaku/generator.rb

@@ -1,6 +1,4 @@
 require 'fileutils'
-require 'active_support'
-require 'active_support/core_ext'
 
 module Daigaku
   class Generator
@@ -43,12 +41,12 @@ module Daigaku
     private
 
     def create_dir(path)
-      return if path.blank?
+      return if path.nil? || path.empty?
       FileUtils.makedirs(path) unless Dir.exist?(path)
     end
 
     def create_file(path)
-      return if path.blank?
+      return if path.nil? || path.empty?
       create_dir(File.dirname(path))
       FileUtils.touch(path) unless File.exist?(path)
     end

data/lib/daigaku/loadable.rb

@@ -1,5 +1,3 @@
-require 'active_support/inflector'
-
 module Daigaku
   module Loadable
     def load(path)
@@ -11,9 +9,24 @@ module Daigaku
 
       dirs.sort.map do |dir|
         dir_path   = File.join(path, dir)
-        class_name = to_s.demodulize.singularize
-        "Daigaku::#{class_name}".constantize.new(dir_path)
+        module_name = demodulize(to_s)
+        class_name = singularize(module_name)
+        daigaku_class(class_name).new(dir_path)
       end
     end
+
+    private
+
+    def demodulize(string)
+      string.split('::').last
+    end
+
+    def singularize(string)
+      string.end_with?('s') ? string[0..-2] : string
+    end
+
+    def daigaku_class(name)
+      Kernel.const_get("Daigaku::#{name}")
+    end
   end
 end

data/lib/daigaku/terminal/courses.rb

@@ -129,8 +129,8 @@ module Daigaku
 
       def store_repo_data(user_and_repo)
         parts  = (user_and_repo ||= Daigaku.config.initial_course).split('/')
-        author = parts.first
-        course = parts.second
+        author = parts[0]
+        course = parts[1]
 
         course = Course.new(course)
         QuickStore.store.set(course.key(:author), author)

data/lib/daigaku/terminal/output.rb

@@ -1,76 +1,71 @@
 require 'thor'
-require 'active_support/concern'
 require 'colorize'
 
 module Daigaku
   module Terminal
     module Output
-      extend ActiveSupport::Concern
+      private
 
-      included do
-        private
-
-        def say(text)
-          output = text.split("\n").map {|line| "\t#{line}" }.join("\n")
-          $stdout.puts output
-        end
-
-        def empty_line
-          $stdout.puts ''
-        end
+      def say(text)
+        output = text.split("\n").map { |line| "\t#{line}" }.join("\n")
+        $stdout.puts output
+      end
 
-        def get(string)
-          $stdout.print "\n\t#{string} "
-          $stdin.gets.strip
-        end
+      def empty_line
+        $stdout.puts ''
+      end
 
-        def say_info(text)
-          say_box(text, ' ℹ', :light_blue)
-        end
+      def get(string)
+        $stdout.print "\n\t#{string} "
+        $stdin.gets.strip
+      end
 
-        def say_warning(text)
-          say_box(text, '⚠ ', :light_red)
-        end
+      def say_info(text)
+        say_box(text, ' ℹ', :light_blue)
+      end
 
-        def say_box(text, symbol, color)
-          empty_line
-          say line.send(color)
-          empty_line
+      def say_warning(text)
+        say_box(text, '⚠ ', :light_red)
+      end
 
-          indented_text = text.split("\n").join("\n#{' ' * (symbol.length + 1)}")
-          say indented_text.prepend("#{symbol} ").send(color)
+      def say_box(text, symbol, color)
+        empty_line
+        say line.send(color)
+        empty_line
 
-          empty_line
-          say line.send(color)
-          empty_line
-        end
+        indented_text = text.split("\n").join("\n#{' ' * (symbol.length + 1)}")
+        say indented_text.prepend("#{symbol} ").send(color)
 
-        def line(symbol = '-')
-          symbol * 70
-        end
+        empty_line
+        say line.send(color)
+        empty_line
+      end
 
-        def get_command(command, description)
-          say description
+      def line(symbol = '-')
+        symbol * 70
+      end
 
-          loop do
-            cmd = get '>'
+      def get_command(command, description)
+        say description
 
-            unless cmd == command
-              say "This was something else. Try \"#{command}\"."
-              next
-            end
+        loop do
+          cmd = get '>'
 
-            system cmd
-            break
+          unless cmd == command
+            say "This was something else. Try \"#{command}\"."
+            next
           end
-        end
 
-        def get_confirm(description)
-          say_warning description
-          confirm = get '(yes|no)'
-          yield if confirm == 'yes' && block_given?
+          system cmd
+          break
         end
       end
+
+      def get_confirm(description)
+        say_warning description
+        confirm = get '(yes|no)'
+        yield if confirm == 'yes' && block_given?
+      end
     end
   end
 end

data/lib/daigaku/version.rb

@@ -1,3 +1,3 @@
 module Daigaku
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/daigaku/views.rb

@@ -1,52 +1,47 @@
 require 'curses'
-require 'active_support/concern'
 require 'daigaku/views/top_bar'
 
 module Daigaku
   module Views
-    extend ActiveSupport::Concern
+    include Curses
 
-    included do
-      include Curses
-
-      def reset_menu_position
-        @position = 0
-      end
-
-      private
+    def reset_menu_position
+      @position = 0
+    end
 
-      def default_window(height = nil, width = nil, top = 0, left = 0)
-        init_screen
+    private
 
-        noecho
-        crmode
-        curs_set(0) # invisible cursor
+    def default_window(height = nil, width = nil, top = 0, left = 0)
+      init_screen
 
-        height ||= lines
-        width  ||= cols + 1
+      noecho
+      crmode
+      curs_set(0) # invisible cursor
 
-        window = Daigaku::Window.new(height, width, top, left)
+      height ||= lines
+      width  ||= cols + 1
 
-        Curses.lines.times do |line|
-          window.setpos(line, 0)
-          window.clear_line
-        end
+      window = Daigaku::Window.new(height, width, top, left)
 
-        window.keypad(true)
-        window.scrollok(true)
-        window.refresh
-        window
+      Curses.lines.times do |line|
+        window.setpos(line, 0)
+        window.clear_line
       end
 
-      def sub_window_below_top_bar(window, top_bar)
-        top_bar.show
+      window.keypad(true)
+      window.scrollok(true)
+      window.refresh
+      window
+    end
 
-        top        = top_bar.height
-        sub_window = window.subwin(window.maxy - top, window.maxx, top, 0)
+    def sub_window_below_top_bar(window, top_bar)
+      top_bar.show
 
-        sub_window.keypad(true)
-        sub_window
-      end
+      top        = top_bar.height
+      sub_window = window.subwin(window.maxy - top, window.maxx, top, 0)
+
+      sub_window.keypad(true)
+      sub_window
     end
   end
 end

data/lib/daigaku/views/menu.rb

@@ -55,7 +55,7 @@ module Daigaku
           window.attrset(index == active_index ? A_STANDOUT : A_NORMAL)
           window.write " #{item} "
           window.attrset(A_NORMAL)
-          window.write " #{items_info[index].try(:join, ' ')}"
+          window.write " #{items_info[index] && items_info[index].join(' ')}"
         end
 
         window.refresh

data/spec/daigaku/course_spec.rb

@@ -143,9 +143,13 @@ describe Daigaku::Course do
     it 'returns the unzipped course' do
       dir    = course_dirs.first
       path   = File.join(File.dirname(dir), 'unzip', File.basename(dir))
-      course = Daigaku::Course.new(path)
 
-      expect(Daigaku::Course.unzip(@zip_file_path).to_json).to eq course.to_json
+      actual = Daigaku::Course.unzip(@zip_file_path)
+      expected = Daigaku::Course.new(path)
+
+      expect(actual.path).to eq expected.path
+      expect(actual.title).to eq expected.title
+      expect(actual.author).to eq expected.author
     end
 
     it 'removes the zip file' do

data/spec/support/macros/resource_helpers.rb

@@ -66,7 +66,7 @@ module ResourceHelpers
     first_course_matches = name.match(course_dirs.first)
 
     if multiple_courses
-      first_course_matches || name.match(course_dirs.second)
+      first_course_matches || name.match(course_dirs[1])
     else
       first_course_matches
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daigaku
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Paul Götze
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-09 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: quick_store
   requirement: !ruby/object:Gem::Requirement
@@ -156,56 +142,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.4
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.4
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.7'
 description: Daigaku is the Japanese word for university. With Daigaku you can interactively
   learn the Ruby programming language using the command line.
 email:
@@ -331,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Learning Ruby on the command line.