six45 0.0.3 → 0.0.4

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+    - 1.9.3
+notifications:
+    email: false
+          

data/CHANGELOG.md

@@ -0,0 +1,27 @@
+## 0.0.3 2012-06-27
+* Improved functionality
+  * Takes 1 string argument 'system', to return 1 system game, contains 8 numbers from 45 (Default: System 8).
+  * Takes 1 string argument 'system' and 1 integer argument 'x', to return 1 system game, each contains 'x' numbers from 45.
+
+``` ruby
+	six45 system      #=> Returns 1 system game, which contains 8 numbers from 45 (Default: System 8).
+	six45 system 9    #=> Returns 1 system game, which contains 9 numbers from 45 (System 9).
+```
+
+## 0.0.2 2012-06-26
+* Improved functionality
+  * Takes 1 integer argument 'x', to return 'x' game(s).
+  * Takes 1 string argument 'magic', to return at least 8 games, and covers at least 23 numbers from 45.
+
+``` ruby
+	six45 30          #=> Returns 30 standard games.
+	six45 magic       #=> Returns at least 8 games, which will cover at least 23 numbers from 45.
+```
+
+## 0.0.1 2012-06-23
+* Initial release.
+  * Picks 6 numbers out of 45, 10 games.
+
+``` ruby
+	six45             #=> Returns 10 standard games.
+```

data/Gemfile

@@ -1,8 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in six45.gemspec
-gemspec
-
-group :development do
-  gem 'debugger'
-end
+gemspec

data/README.md

@@ -1,4 +1,4 @@
-# Six45
+# Six45 [![Build Status](https://secure.travis-ci.org/moom/six45.png)](http://travis-ci.org/moom/six45)
 
 A Gem helps pick 6 numbers out of 45.
 
@@ -20,11 +20,13 @@ Or install it yourself as:
 
 Run 'six45' in commandline:
 
-    # six45             => Returns 10 standard games.
-    # six45 30          => Returns 30 standard games.
-    # six45 magic       => Returns at least 7 games, which will cover at least 23 numbers from 45.
-    # six45 system      => Returns 1 system game, which contains 8 numbers from 45 (Default: System 8).
-    # six45 system 9    => Returns 1 system game, which contains 9 numbers from 45 (System 9).
+    # six45             			=> Returns 10 standard games.
+    # six45 30          			=> Returns 30 standard games.
+    # six45 magic       			=> Returns at least 8 games, which will cover at least 23 numbers from 45.
+    # six45 system      			=> Returns 1 system-8 game, which contains 8 numbers from 45 (Default: System 8).
+    # six45 system 9    			=> Returns 1 system-9 game, which contains 9 numbers from 45 (System 9).
+    # six45 magic system    	=> Returns 8 standard games, which covers all 45 numbers.
+    # six45 magic system 9    => Returns 5 system-9 games, each contains 9 numbers from 45 (System 9), and cover all 45 numbers.
 
 ## Contributing
 

data/Rakefile

@@ -1,2 +1,7 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/bin/six45

@@ -4,7 +4,15 @@ require 'six45'
 require 'pp'
 
 if ARGV[0] == "magic"
-  Six45.magic_pick.each { |key, game| pp game }
+  if ARGV[1] == "system"
+    if Six45.is_number?(ARGV[2])
+      Six45.magic_system_pick(ARGV[2].to_i).each { |game| pp game }
+    else
+      Six45.magic_system_pick.each { |game| pp game }
+    end
+  else
+    Six45.magic_pick.each { |key, game| pp game }
+  end
 elsif ARGV[0] == "system"
   number_of_numbers = Six45.is_number?(ARGV[1]) ? ARGV[1].to_i : 8
   Six45.system_pick(number_of_numbers).each { |key, game| pp game }

data/lib/six45.rb

@@ -8,50 +8,21 @@ module Six45
     Seeds.new.generate seed_size
   end
 
-  def lucky_candidates(seed_size=6)
-    lucky_seed = Seeds.new.generate seed_size
-    candidates = []
-    while lucky_seed.size > 0
-      candidates << lucky_seed.inject { |sum, d| sum+d }
-      lucky_seed.pop
-    end
-    candidates.sort
-  end
-
-  def lucky_numbers(game_size=6)
-    numbers = lucky_candidates game_size
-    if numbers.any? { |d| d > 45 } || numbers.inject { |sum, d| sum+d } < 60
-      lucky_numbers game_size
-    else
-      numbers
-    end
-  end
-
   def pick(number_of_games=10)
     games = {}
     number_of_games.times do |i|
-      games[i] = lucky_numbers
+      games[i] = Seeds.new.lucky_numbers
     end
     games
   end
 
-  def magic_seed
-    a_magic_seed = seed 5
-    sum_of_the_seed = a_magic_seed.inject { |sum, n| sum+n }
-    if sum_of_the_seed>36 || is_odd?(sum_of_the_seed)
-      magic_seed
-    else
-      a_magic_seed
-    end
-  end
-
   def magic_pick
     magic_numbers = []
     magic_games = {}
     a_magic_seed = [1]
-    a_magic_seed += magic_seed
+    a_magic_seed += Seeds.new.magic_seed
     while a_magic_seed.size > 1 do
-      magic_numbers << a_magic_seed.inject(1) { |sum, n| sum+n }
+      magic_numbers << a_magic_seed.inject(1, &:+)
       a_magic_seed.pop
     end
     magic_numbers << a_magic_seed.last
@@ -63,16 +34,25 @@ module Six45
   end
 
   def system_pick(size_of_games=8)
-    { 1 => (lucky_numbers size_of_games) }
+    {1 => (Seeds.new.lucky_numbers size_of_games)}
+  end
+  
+  def magic_system_pick(size_of_games=6)
+    number_of_games = 45/size_of_games
+    all_numbers = (1..45).to_a
+    all_games = (1..number_of_games).map do
+      chosen_numbers = all_numbers.sample(size_of_games).sort
+      all_numbers -= chosen_numbers
+      chosen_numbers
+    end
+    unless all_numbers.size == 0 
+      all_numbers += ((1..45).to_a - all_numbers).sample(size_of_games - all_numbers.size)
+      all_games << all_numbers.sort
+    end
+    all_games
   end
 
   def is_number?(i)
     true if Float(i) rescue false
   end
-
-  private
-  def is_odd?(number)
-    number%2 == 1 ? true : false
-  end
-
 end

data/lib/six45/seeds.rb

@@ -0,0 +1,38 @@
+module Six45
+  class Seeds
+
+    def initialize(min=1, max=13)
+      @min = min
+      @max = max
+    end
+
+    def generate(seed_size=6)
+      seed_size.times.map { rand(@min..@max) }
+    end
+
+    def magic_seed
+      a_magic_seed = generate 5
+      sum_of_the_seed = a_magic_seed.inject(0, &:+)
+      if sum_of_the_seed>36 || sum_of_the_seed.odd?
+        magic_seed
+      else
+        a_magic_seed
+      end
+    end
+
+    def lucky_numbers(game_size=6)
+      lucky_seed = generate game_size
+      numbers = []
+      while lucky_seed.size > 0
+        numbers << lucky_seed.inject(0, &:+)
+        lucky_seed.pop
+      end
+      if numbers.any? { |d| d > 45 } || numbers.uniq.size < game_size || numbers.inject(0, &:+) < 60
+        lucky_numbers game_size
+      else
+        numbers.sort
+      end
+    end
+
+  end
+end

data/lib/six45/version.rb

@@ -1,3 +1,3 @@
 module Six45
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/six45.gemspec

@@ -1,17 +1,21 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/six45/version', __FILE__)
+$:.push File.expand_path("../lib", __FILE__)
+require 'six45/version'
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Felix Wang"]
-  gem.email         = ["moom.felix@gmail.com"]
-  gem.description   = %q{A Gem helps pick 6 digits out of 45.}
-  gem.summary       = %q{A Gem helps pick 6 digits out of 45.}
-  gem.homepage      = "https://github.com/moom/six45.git"
+  gem.authors = ["Felix Wang"]
+  gem.email = ["moom.felix@gmail.com"]
+  gem.description = %q{A Gem helps pick 6 digits out of 45.}
+  gem.summary = %q{A Gem helps pick 6 digits out of 45.}
+  gem.homepage = "https://github.com/moom/six45.git"
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "six45"
+  gem.files = `git ls-files`.split($\)
+  gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name = "six45"
   gem.require_paths = ["lib"]
-  gem.version       = Six45::VERSION
+  gem.version = Six45::VERSION
+
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
 end

data/spec/six45/seeds_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe Six45::Seeds do
+
+  let(:seeds_obj) { Six45::Seeds.new }
+
+  context "#generate" do
+    let(:seed) { seeds_obj.generate }
+    let(:seed_five) { lambda { Six45::Seeds.new.generate 5 } }
+    it "returns an array" do
+      seed.should be_kind_of(Array)
+    end
+    it "containing 6 numbers" do
+      seed.size.should eq(6)
+    end
+    it "each number is less than 13" do
+      seed.each { |n| n.should be <=13 }
+    end
+    it "also accepts an integer argument 5" do
+      seed_five.call.should_not raise_error ArgumentError
+    end
+    it "returns an array" do
+      seed_five.call.should be_kind_of(Array)
+    end
+    it "containing 5 numbers" do
+      seed_five.call.size.should eq(5)
+    end
+  end
+
+  context "#magic_seed" do
+    let(:magic_seed) { seeds_obj.magic_seed }
+    let(:sum_of_seed) { magic_seed.inject(0, &:+) }
+    it "returns an array" do
+      magic_seed.should be_kind_of(Array)
+    end
+    it "containing 5 numbers" do
+      magic_seed.size.should eq(5)
+    end
+    it "each number is less than 13" do
+      magic_seed.each { |n| n.should be <=13 }
+    end
+    it "sum of the seed is equal or less than 36" do
+      sum_of_seed.should be <=36
+    end
+    it "sum of the seed is an even number" do
+      sum_of_seed.even?.should eq(true)
+    end
+  end
+
+  context "#lucky_numbers" do
+    let(:lucky_numbers) { seeds_obj.lucky_numbers }
+    let(:sum_of_lucky_numbers) { lucky_numbers.inject(0, &:+) }
+    it "returns an array" do
+      lucky_numbers.should be_kind_of(Array)
+    end
+    it "containing 6 numbers" do
+      lucky_numbers.size.should eq(6)
+    end
+    it "each number is less than 45" do
+      lucky_numbers.each { |n| n.should be <=45 }
+    end
+    it "sum of the lucky numbers is greater than 60" do
+      sum_of_lucky_numbers.should be >60
+    end
+  end
+end
+
+
+
+
+
+
+
+

data/spec/six45_spec.rb

@@ -1,89 +1,98 @@
-require "six45"
+require 'spec_helper'
 
 describe Six45 do
 
-  context "#seed" do
-    let(:seed) { Six45.seed }
-    let(:seed_five) { lambda { Six45.seed 5 } }
-    it "returns an array" do
-      seed.should be_kind_of(Array)
-    end
-    it "containing 6 numbers" do
-      seed.size.should eq(6)
-    end
-    it "each number is less than 13" do
-      seed.each { |n| n.should be <= 13 }
-    end
-    it "also accepts an integer argument 5" do
-      seed_five.call.should_not raise_error ArgumentError
-    end
-    it "returns an array" do
-      seed_five.call.should be_kind_of(Array)
-    end
-    it "containing 5 numbers" do
-      seed_five.call.size.should be 5
-    end
-  end
+  let(:mock_seeds_obj) { mock("Seeds") }
 
-  context "#pick" do
-    let(:seed) { Six45.seed }
-    let(:lucky_numbers) { Six45.pick }
-    let(:pick_five) { lambda { Six45.pick 5 } }
-    it "returns a hash" do
-      lucky_numbers.should be_kind_of(Hash)
-    end
-    it "containing 10 games" do
-      lucky_numbers.size.should be 10
-    end
-    it "each game contains 6 numbers" do
-      lucky_numbers.each { |k, g| g.size.should eq(6) }
-    end
-    it "each number is unique" do
-      lucky_numbers.each { |k, g| g.uniq.size.should eq g.size }
-    end
-    it "each number is less than 45" do
-      lucky_numbers.each { |k, g| g.each { |n| n.should be <= 45 } }
-    end
-    it "sum of all numbers is greater than 60" do
-      lucky_numbers.each { |k, g| g.inject { |sum, n| sum+n }.should be > 60 }
-    end
-    it "also accepts an integer argument 5" do
-      pick_five.call.should_not raise_error ArgumentError
-    end
-    it "returns a hash" do
-      pick_five.call.should be_kind_of(Hash)
-    end
-    it "containing 5 games" do
-      pick_five.call.size.should be 5
-    end
+  before(:each) do
+    Six45::Seeds.stub(:new).and_return(mock_seeds_obj)
+    mock_seeds_obj.stub(:generate).and_return([4, 3, 10, 8, 2, 1])
+    mock_seeds_obj.stub(:magic_seed).and_return([3, 10, 8, 2, 1])
+    mock_seeds_obj.stub(:lucky_numbers).and_return([7, 11, 22, 28, 34, 42])
   end
 
-  context "#magic_pick" do
-    let(:lucky_numbers) { Six45.magic_pick }
-    it "returns a hash" do
-      lucky_numbers.should be_kind_of(Hash)
-    end
-    it "containing at least 8 games" do
-      lucky_numbers.size.should be >= 8
-    end
-    it "each game contains 6 unique numbers" do
-      lucky_numbers.each do |k, g|
-        g.size.should eq g.uniq.size
-        g.size.should eq 6
-      end
-    end
-    it "all games cover at least 23 numbers" do
-      all_numbers = lucky_numbers.map { |k, v| v }.flatten.uniq
-      all_numbers.size.should be > 23
-    end
-    it "always returns even number of games" do
-      (lucky_numbers.size%2).should be 0
-    end
-  end
+  context "#seed" do
+     it "sends 'new' and 'generate' messages to Seeds" do
+       Six45::Seeds.should_receive(:new).and_return(mock_seeds_obj)
+       mock_seeds_obj.should_receive(:generate).with(6)
+       Six45.seed
+     end
+     it "returns an array of 6 numbers" do
+       the_seed = Six45.seed
+       the_seed.should be_kind_of(Array)
+       the_seed.size.should be 6
+     end
+     it "each number is less than 13" do
+       the_seed = Six45.seed
+       the_seed.each { |seed| seed.should be <13 }
+     end
+   end
+   
+   context "#pick" do
+     let(:lucky_numbers) { Six45.pick }
+     it "returns a hash" do
+       lucky_numbers.should be_kind_of(Hash)
+     end
+     it "containing 10 games" do
+       lucky_numbers.size.should be 10
+     end
+     it "each game contains 6 numbers" do
+       lucky_numbers.each { |k, g| g.size.should eq(6) }
+     end
+     it "each number is unique" do
+       lucky_numbers.each { |k, g| g.uniq.size.should eq g.size }
+     end
+     it "each number is less than 45" do
+       lucky_numbers.each { |k, g| g.each { |n| n.should be <= 45 } }
+     end
+     it "sum of all numbers is greater than 60" do
+       lucky_numbers.each { |k, g| g.inject(0, &:+).should be > 60 }
+     end
+   end
+   
+   context "#Pick number_of_games" do
+     let(:pick_five) { lambda { Six45.pick 5 } }
+     it "also accepts an integer argument 5" do
+       pick_five.call.should_not raise_error ArgumentError
+     end
+     it "returns a hash" do
+       pick_five.call.should be_kind_of(Hash)
+     end
+     it "containing 5 games" do
+       pick_five.call.size.should be 5
+     end
+   end
+   
+   context "#magic_pick" do
+     let(:lucky_numbers) { Six45.magic_pick }
+     it "returns a hash" do
+       lucky_numbers.should be_kind_of(Hash)
+     end
+     it "containing at least 8 games" do
+       lucky_numbers.size.should be >= 8
+     end
+     it "each game contains 6 unique numbers" do
+       lucky_numbers.each do |k, g|
+         g.size.should eq g.uniq.size
+         g.size.should eq 6
+       end
+     end
+     it "all games cover at least 23 numbers" do
+       all_numbers = lucky_numbers.map { |k, v| v }.flatten.uniq
+       all_numbers.size.should be > 23
+     end
+     it "always returns even number of games" do
+       (lucky_numbers.size%2).should be 0
+     end
+   end
 
   context "#system_pick" do
     let(:lucky_numbers) { Six45.system_pick }
     let(:pick_nine) { lambda { Six45.system_pick 9 } }
+    before(:each) do
+      mock_seeds_obj.stub(:lucky_numbers).with(8).and_return([7, 11, 22, 28, 34, 38, 41, 42])
+      mock_seeds_obj.stub(:lucky_numbers).with(9).and_return([7, 11, 18, 22, 28, 34, 38, 41, 42])
+    end
     it "returns a hash" do
       lucky_numbers.should be_kind_of(Hash)
     end
@@ -109,4 +118,40 @@ describe Six45 do
       pick_nine.call[1].size.should be 9
     end
   end
+  
+  context "#magic_system_pick" do
+    let(:magic_system_lucky_numbers) { Six45.magic_system_pick }
+    let(:magic_system_pick_nine) { lambda { Six45.magic_system_pick 9 } }
+    before(:each) do
+      mock_seeds_obj.stub(:lucky_numbers).with(8).and_return([7, 11, 22, 28, 34, 38, 41, 42])
+      mock_seeds_obj.stub(:lucky_numbers).with(9).and_return([7, 11, 18, 22, 28, 34, 38, 41, 42])
+    end
+    it "returns an array" do
+      magic_system_lucky_numbers.should be_kind_of(Array)
+    end
+    it "containing 8 games" do
+      magic_system_lucky_numbers.size.should be 8
+    end
+    it "the game contains 6 unique numbers" do
+      magic_system_lucky_numbers.each do |g|
+        g.size.should eq g.uniq.size
+        g.size.should eq 6
+      end
+    end
+    it "also accepts an integer argument 9" do
+      magic_system_pick_nine.call.should_not raise_error ArgumentError
+    end
+    it "returns an array" do
+      magic_system_pick_nine.call.should be_kind_of(Array)
+    end
+    it "containing 5 game" do
+      magic_system_pick_nine.call.size.should be 5
+    end
+    it "the game contains 9 unique numbers" do
+      magic_system_pick_nine.call[1].size.should be 9
+    end
+    it "all games cover all 45 numbers" do
+      magic_system_pick_nine.call.flatten.uniq.size.should be 45
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'six45'
+require 'six45/seeds'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: six45
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
-dependencies: []
+date: 2012-07-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Gem helps pick 6 digits out of 45.
 email:
 - moom.felix@gmail.com
@@ -20,16 +52,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/six45
 - lib/six45.rb
-- lib/six45/Seeds.rb
+- lib/six45/seeds.rb
 - lib/six45/version.rb
 - six45.gemspec
+- spec/six45/seeds_spec.rb
 - spec/six45_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/moom/six45.git
 licenses: []
 post_install_message: 
@@ -55,4 +91,6 @@ signing_key:
 specification_version: 3
 summary: A Gem helps pick 6 digits out of 45.
 test_files:
+- spec/six45/seeds_spec.rb
 - spec/six45_spec.rb
+- spec/spec_helper.rb

data/lib/six45/Seeds.rb

@@ -1,13 +0,0 @@
-module Six45
-  class Seeds
-    def initialize(min=1, max=13)
-      @min = min
-      @max = max
-    end
-
-    def generate(seed_size)
-      seed_size.times.map{rand(@min..@max)}
-    end
-
-  end
-end