diaspora-cluster-creator 0.1.0 → 0.2.0

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+cluster.png
+cluster.dot

data/README.md

@@ -7,6 +7,8 @@ fast unit tests.
 
 ## Installation
 
+You will need to install [Graphviz](http://graphviz.org)
+
 Add this line to your application's Gemfile:
 
     gem 'diaspora-cluster-creator'
@@ -21,7 +23,21 @@ Or install it yourself as:
 
 ## Usage
 
+Once installed you can ask diaspora-cluster for help
+
+	$ diaspora-cluster -h
+
+Or request the defaults
+
+	$ diaspora-cluster
+
+Or you can specify names
+
+	$ diaspora-cluster names="Sparta [T2 E1 R3], Athens [T-2], Corinth [R3 T2 E1], Ephesus, Rhodes [T4]"
+
+Or perhaps you prefer a PNG
 
+	$ diaspora-cluster filename=output.png names="Sparta [T2 E1 R3], Athens [T-2], Corinth [R3 T2 E1], Ephesus, Rhodes [T4]"
 
 ## Contributing
 

data/features/cluster.feature

@@ -3,9 +3,4 @@ Feature: Cluster creation
 Scenario: Cluster creation
   When I request a new cluster with 5 star systems
   Then the output should have 5 nodes
-  And the output should have at least 4 edges
-  
-Scenario: Named systems
-  When I create a new cluster with systems "Foo", "Bar", "Baz"
-  Then the graph should have nodes "Foo", "Bar", "Baz"
-  And the graph should have edges between "Foo", "Bar", "Baz"
+  And the output should have at least 4 edges

data/features/star_system.feature

@@ -4,4 +4,10 @@ Scenario: Star System Creation
   When I create a Star System
   Then it should have a technology rating
   And it should have a resources rating
-  And it should have a environment rating
+  And it should have a environment rating
+  
+Scenario: Named Star System Creation
+  When I create a Star System with name "Sparta [T1 E-2 R3]"
+  Then it should have a technology rating of 1
+  And it should have a resources rating of 3
+  And it should have a environment rating of -2

data/features/step_definitions/star_system_steps.rb

@@ -2,7 +2,15 @@ When /^I create a Star System$/ do
   current_star_system
 end
 
+When /^I create a Star System with (?:the )?name "([^"]*)"$/ do |name|
+  set_current_star_system(name)
+end
+
 Then /^it should have an? (#{CAPTURE_SYSTEM_ATTRIBUTE}) rating$/ do |system_attribute|
   current_star_system.send(system_attribute).must_be :<=, 4
   current_star_system.send(system_attribute).must_be :>=, -4
+end
+
+Then /^it should have an? (#{CAPTURE_SYSTEM_ATTRIBUTE}) rating of (#{CAPTURE_INTEGER})$/ do |system_attribute, rating|
+  current_star_system.send(system_attribute).must_equal rating
 end

data/features/support/world.rb

@@ -15,6 +15,11 @@ module KnowsTheDomain
   def current_star_system
     @current_star_system ||= StarSystem.new(current_cluster, 1)
   end
+
+  def set_current_star_system(value)
+    @current_star_system = StarSystem.new(current_cluster, value)
+  end
+  
   def current_graph
     @current_graph ||= Graph.new(current_cluster)
   end

data/lib/diaspora-cluster-creator/star_system.rb

@@ -12,8 +12,8 @@ module Diaspora
           end
           @@rolled_attributes
         end
-        def self.rolled_attribute(attribute_name)
-          rolled_attributes << attribute_name
+        def self.rolled_attribute(attribute_name, abbreviation = nil)
+          rolled_attributes << attribute_name.to_s
           define_method(attribute_name) do
             instance_variable_get("@#{attribute_name}") || instance_variable_set("@#{attribute_name}", dice.roll)
             instance_variable_get("@#{attribute_name}")
@@ -36,12 +36,12 @@ module Diaspora
         attr_reader :context, :name
         def initialize(context, name)
           @context = context
-          @name = name
+          set_name(name.to_s)
         end
 
-        rolled_attribute :technology
-        rolled_attribute :resources
-        rolled_attribute :environment
+        rolled_attribute :technology, :t
+        rolled_attribute :resources, :r
+        rolled_attribute :environment, :e
         
         include Comparable
         def <=>(other)
@@ -59,6 +59,21 @@ module Diaspora
         def label
           "#{name}\nT#{technology} R#{resources} E#{environment}"
         end
+        
+        protected
+        def set_name(name_with_attribtes)
+          name, options = name_with_attribtes.strip.split(/ *\[/)
+          @name = name
+          if options
+            options.sub(/\]$/,'').split.collect(&:strip).each do |option|
+              original, attribute_prefix, value = option.match(/(\w) *(-?\d)/).to_a
+              if attribute_name = self.class.rolled_attributes.detect {|roled_attribute| roled_attribute =~ /^#{attribute_prefix}/i}
+                send("#{attribute_name}=",value)
+              end
+            end
+          end
+          @name
+        end
       end
     end
   end

data/lib/diaspora-cluster-creator/version.rb

@@ -1,7 +1,7 @@
 module Diaspora
   module Cluster
     module Creator
-      VERSION = "0.1.0"
+      VERSION = "0.2.0"
     end
   end
 end

data/spec/diaspora-cluster-creator/star_system_spec.rb

@@ -3,14 +3,28 @@ require 'star_system'
 
 describe StarSystem do
   subject { StarSystem.new( Object.new, 1 ) }
-  
+
+  describe '#initialize with one attribute' do
+    subject { StarSystem.new(Object.new, "Sparta [T1 E-4]") }
+    it 'should have an extracted name' do
+      subject.name.must_equal 'Sparta'
+    end
+    it 'should have an preset attribute' do
+      with_loaded_dice(0, subject) do
+        subject.resources.must_equal 0
+        subject.technology.must_equal 1
+        subject.environment.must_equal -4
+      end
+    end
+  end
+
   describe '#technology=' do
     it 'should be overridable' do
       subject.technology = 3
       subject.technology.must_equal 3
     end
   end
-  
+
   describe '#technology' do
     it 'should be randomly rolled' do
       with_loaded_dice(1, subject) do
@@ -34,7 +48,7 @@ describe StarSystem do
       end
     end
   end
-  
+
   describe '#<=>' do
     it 'should be comparable to another star system' do
       @system_a = StarSystem.new('', 1)
@@ -46,13 +60,13 @@ describe StarSystem do
       end
     end
   end
-  
+
   describe '.guarantee!' do
     it 'should adjust technology rating without altering the sort order' do
       @system_a = StarSystem.new('', 1)
       @system_b = StarSystem.new('', 2)
       @system_c = StarSystem.new('', 3)
-      order = 
+      order =
       with_loaded_dice(1, @system_a) do
         with_loaded_dice(0, @system_b) do
           with_loaded_dice(-1, @system_c) do
@@ -71,7 +85,7 @@ describe StarSystem do
       @system_a = StarSystem.new('', 1)
       @system_b = StarSystem.new('', 2)
       @system_c = StarSystem.new('', 3)
-      order = 
+      order =
       with_loaded_dice(2, @system_a) do
         with_loaded_dice(0, @system_b) do
           with_loaded_dice(-1, @system_c) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diaspora-cluster-creator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156617540 !ruby/object:Gem::Requirement
+  requirement: &2152337300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156617540
+  version_requirements: *2152337300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156617120 !ruby/object:Gem::Requirement
+  requirement: &2152336840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156617120
+  version_requirements: *2152336840
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2156616680 !ruby/object:Gem::Requirement
+  requirement: &2152336300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156616680
+  version_requirements: *2152336300
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2156616040 !ruby/object:Gem::Requirement
+  requirement: &2152335700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156616040
+  version_requirements: *2152335700
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &2156615380 !ruby/object:Gem::Requirement
+  requirement: &2152335000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156615380
+  version_requirements: *2152335000
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2156614900 !ruby/object:Gem::Requirement
+  requirement: &2152333700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156614900
+  version_requirements: *2152333700
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &2156614460 !ruby/object:Gem::Requirement
+  requirement: &2152332980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156614460
+  version_requirements: *2152332980
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &2156613960 !ruby/object:Gem::Requirement
+  requirement: &2152332540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156613960
+  version_requirements: *2152332540
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
-  requirement: &2156613480 !ruby/object:Gem::Requirement
+  requirement: &2152331640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156613480
+  version_requirements: *2152331640
 - !ruby/object:Gem::Dependency
   name: main
-  requirement: &2156613040 !ruby/object:Gem::Requirement
+  requirement: &2152330880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156613040
+  version_requirements: *2152330880
 - !ruby/object:Gem::Dependency
   name: dependency_injector
-  requirement: &2156612580 !ruby/object:Gem::Requirement
+  requirement: &2152330440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156612580
+  version_requirements: *2152330440
 description: Command-line utility to create Diaspora cluster
 email:
 - jeremy.n.friesen@gmail.com