scrambler 0.1.1 → 0.1.2

data/lib/scrambler/megaminx.rb

@@ -5,10 +5,10 @@ module Scrambler
       variants = %w(-- ++)
       variants_for_u = ["'", ""]
       (1..lines).map do |line|
-        ((1..columns).map do |column|
-          turns.sample + variants.sample
+        ((0..(columns-1)).map do |column|
+          turns[column % 2] + variants.sample
         end + ["U#{variants_for_u.sample}"]).join(" ")
       end.join("\n")
     end
   end
-end
+end

data/lib/scrambler/version.rb

@@ -1,3 +1,3 @@
 module Scrambler
-  VERSION = "0.1.1"
-end
+  VERSION = "0.1.2"
+end

data/spec/scrambler/megaminx_spec.rb

@@ -3,8 +3,10 @@ require "spec_helper"
 describe Scrambler::Megaminx do
   let(:valid_turns) { %w(R++ R-- D++ D--) }
 
+  subject { Scrambler::Megaminx.new.scramble }
+
   it "should default to 7 lines and 10 columns" do
-    lines = subject.scramble.split("\n")
+    lines = subject.split("\n")
     lines.should have(7).elements
     lines.each do |line|
       line.split(" ").should have(11).elements
@@ -12,16 +14,28 @@ describe Scrambler::Megaminx do
   end
 
   it "should have U / U' at the end of each line" do
-    subject.scramble.split("\n").each do |line|
+    subject.split("\n").each do |line|
       line.should match(/U'?\Z/)
     end
   end
 
   it "should contain R++/R-- and D++/D-- turns at the first 'column' turns" do
-    subject.scramble.split("\n"). each do |line|
+    subject.split("\n"). each do |line|
       line.split(" ")[0..-2].each do |turn|
         valid_turns.should include(turn)
       end
     end
   end
-end
+
+  it "should switch between R and D turns, beginning with R" do
+    basic_turns = subject.split("\n").first.split(" ").map { |t| t[0..0] }
+    basic_turns[0].should == "R"
+    basic_turns[1].should == "D"
+    basic_turns[2].should == "R"
+    basic_turns[3].should == "D"
+    basic_turns[4].should == "R"
+    basic_turns[5].should == "D"
+    basic_turns[6].should == "R"
+    basic_turns[7].should == "D"
+  end
+end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scrambler
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
-  version: 0.1.1
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tim Habermaas
@@ -20,7 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.6.0
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
+        version: 2.8.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -31,6 +41,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -86,12 +99,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
@@ -102,4 +121,3 @@ specification_version: 3
 summary: Scrambler for cubes and other puzzles
 test_files: []
 
-has_rdoc: