stuka 0.0.12 → 0.1.0

data/spec/unit/external/finder_spec.rb

@@ -1,19 +1,19 @@
 require "spec_helper"
-require "unit/external/example_source/create_world"
+require "unit/external/example_source/processes/create_world"
 require "unit/external/process_interface"
 require "stuka/external/action_finder"
 
-require "unit/external/example_source/world/gather_materials"
-require "unit/external/example_source/world/scrap_world"
-require "unit/external/example_source/world/seperate_light_from_darkness"
+require "unit/external/example_source/actions/world/gather_materials"
+require "unit/external/example_source/actions/world/scrap_world"
+require "unit/external/example_source/actions/world/seperate_light_from_darkness"
 
-describe Stuka::ActionFinder do
+describe Stuka::External::ActionFinder do
 
-  let(:finder) { Stuka::ActionFinder.new }
+  let(:finder) { Stuka::External::ActionFinder.new }
   let(:process) { double() }
 
   before :each do
-    Stuka::StukaPaths::PROCESSES_SOURCE_PATH.replace "#{File.dirname(__FILE__)}/example_source"
+    Stuka::StukaPaths::ACTIONS_SOURCE_PATH.replace "#{File.dirname(__FILE__)}/example_source/actions"
   end
 
   it "finds actions" do
@@ -31,7 +31,7 @@ describe Stuka::ActionFinder do
   end
 
   it "throws an UnknownAction error if it can't find the action class" do
-    expect { finder.find_action("some::unknown_action", process) }.to raise_error(Stuka::UnknownAction)
+    expect { finder.find_action("some::unknown_action", process) }.to raise_error(Stuka::External::UnknownAction)
   end
 
 end

data/spec/unit/external/process_to_dispatcher_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require_relative "example_source/create_world"
+require_relative "example_source/processes/create_world"
 require "stuka/external/business_process"
 
 describe "ExampleProcess" do
@@ -22,6 +22,7 @@ describe "ExampleProcess" do
 
   before :each do
     Stuka::StukaPaths::PROCESSES_SOURCE_PATH.replace "#{File.dirname(__FILE__)}/example_source"
+    Stuka::StukaPaths::ACTIONS_SOURCE_PATH.replace "#{File.dirname(__FILE__)}/example_source/actions"
   end
 
   it "notifies the dispatcher of any other end event" do
@@ -29,7 +30,7 @@ describe "ExampleProcess" do
     expect(dispatcher).to receive(:call).with(:failure, {})
     process.run({})
 
-    expect(process.current_state).to eq(Stuka::BusinessProcess::PROCESS_STATES[:finished])
+    expect(process.current_state).to eq(Stuka::External::BusinessProcess::PROCESS_STATES[:finished])
   end
 
 end

data/spec/unit/external/process_to_finder_spec.rb

@@ -1,5 +1,5 @@
 require "spec_helper"
-require "unit/external/example_source/kill_monster"
+require "unit/external/example_source/processes/kill_monster"
 require "unit/external/process_interface"
 require "stuka/external/business_process"
 
@@ -11,16 +11,7 @@ describe KillMonster do
 
   let(:process) do
   
-    KillMonster.new(action_finder: finder) do |on|
-    
-      on.success {
-        puts "yay success"
-      }
-      on.failure {
-        puts "nay failure"
-      }
-
-    end
+    KillMonster.new(action_finder: finder)
 
   end
   
@@ -70,9 +61,18 @@ describe KillMonster do
       expect(finder).to_not receive(:find_action).with("monster::get_a_new_gun", process)
       expect(finder).to_not receive(:find_action).with("monster::get_bullets", process)
 
-      process.run({})
+      process.run({}) do |on|
+      
+        on.success {
+          puts "yay success"
+        }
+        on.failure {
+          puts "nay failure"
+        }
+
+      end
     
-      expect(process.current_state).to eq Stuka::BusinessProcess::PROCESS_STATES[:finished]
+      expect(process.current_state).to eq Stuka::External::BusinessProcess::PROCESS_STATES[:finished]
 
     end
 
@@ -98,9 +98,18 @@ describe KillMonster do
       
       expect(finder).to_not receive(:find_action).with("monster::get_a_sharp_sword", process)
 
-      process.run({})
+      process.run({}) do |on|
+      
+        on.success {
+          puts "yay success"
+        }
+        on.failure {
+          puts "nay failure"
+        }
+
+      end
     
-      expect(process.current_state).to eq Stuka::BusinessProcess::PROCESS_STATES[:finished]
+      expect(process.current_state).to eq Stuka::External::BusinessProcess::PROCESS_STATES[:finished]
 
     end
 
@@ -127,9 +136,18 @@ describe KillMonster do
       expect(finder).to_not receive(:find_action).with("monster::get_a_new_gun", process)
       expect(finder).to_not receive(:find_action).with("gun::get_bullets", process)
       
-      process.run({})
+      process.run({}) do |on|
+    
+        on.success {
+          puts "yay success"
+        }
+        on.failure {
+          puts "nay failure"
+        }
+
+      end
       
-      expect(process.current_state).to eq Stuka::BusinessProcess::PROCESS_STATES[:finished]
+      expect(process.current_state).to eq Stuka::External::BusinessProcess::PROCESS_STATES[:finished]
 
     end
 

data/spec/unit/internal/action_builder_spec.rb

@@ -1,22 +1,92 @@
 require "spec_helper"
 require "stuka/internal/source_builders/action_builder"
+require "stuka/config/stuka_paths"
+require "fileutils"
 
 describe "ActionBuilder" do
 
+  let(:stream) { double(puts: "") }
+
   around(:each) do |example|
-    FileUtils.rm_rf("#{Stuka::StukaPaths::TEST_PROCESSES_SOURCE_PATH}/.", secure: true)
+    FileUtils.rm_rf("#{Stuka::StukaPaths::TEST_ACTIONS_SOURCE_PATH}/.", secure: true)
     example.run
-    FileUtils.rm_rf("#{Stuka::StukaPaths::TEST_PROCESSES_SOURCE_PATH}/.", secure: true)
+    FileUtils.rm_rf("#{Stuka::StukaPaths::TEST_ACTIONS_SOURCE_PATH}/.", secure: true)
   end
 
   it "builds ruby source with ActionBuilder::build" do
-    Stuka::ActionBuilder.build
+    Stuka::ActionBuilder.build(stream)
 
-    source_files = Dir["#{Stuka::StukaPaths::PROCESSES_SOURCE_PATH}/*.rb"]
+    source_files = Dir["#{Stuka::StukaPaths.actions_source_path}/*/*.rb"]
     source_files = source_files.map{ |path| File.basename(path) }
     expect(source_files.count).to eq(2)
-    expect(source_files.include? "acc1_action.rb").to be(true)
-    expect(source_files.include? "acc2_action.rb").to be(true)
+    expect(source_files.include? "acc1.rb").to be(true)
+    expect(source_files.include? "acc2.rb").to be(true)
+  end
+
+  it "notifies if the action file already exists using stdout passed as an argument" do
+
+    Stuka::ActionBuilder.build(stream)
+
+    expect(stream).to receive(:puts).with("action file bla::acc1 already exists.")
+
+    Stuka::ActionBuilder.build(stream)
+
+    source_files = Dir["#{Stuka::StukaPaths.actions_source_path}/*/*.rb"]
+    source_files = source_files.map{ |path| File.basename(path) }
+    expect(source_files.count).to eq(2)
+    expect(source_files.include? "acc1.rb").to be(true)
+    expect(source_files.include? "acc2.rb").to be(true)
+
+  end
+
+  it "edits only comments of existing action file and leaves the whole class intact" do
+
+    make_test_action_file
+
+    Stuka::ActionBuilder.build(stream)
+
+    require_relative "#{File.dirname(__FILE__)}/actions_source_test/bla/acc1.rb"
+    expect(Bla::Acc1.instance_methods.include? :additional_method).to be true
+  end
+
+  private
+
+  def make_test_action_file
+    file_content = <<-TEST
+
+##
+# example action file
+# this is the old description
+# it should be overriden
+# by the new description
+# of the action
+# bla
+#
+
+# but the next comment section should stay
+
+require 'stuka/external/business_action'
+
+module Bla
+  class Acc1 < Stuka::External::BusinessAction
+
+    def run(params)
+      params[stream].puts "test"
+    end
+
+    def additional_method
+
+    end
+
+  end
+end
+
+TEST
+
+    FileUtils.mkdir_p "#{File.dirname(__FILE__)}/actions_source_test/bla"
+    out_file = File.new("#{File.dirname(__FILE__)}/actions_source_test/bla/acc1.rb", "w")
+    out_file.puts(file_content)
+    out_file.close
   end
 
 end

data/spec/unit/internal/action_domain_builder_spec.rb

@@ -7,23 +7,29 @@ describe Stuka::ActionDomainBuilder do
 
   it "Creates an action and stores it in @instances attribute with ActionDomainBuilder#action method, this method is called in the dsl." do
 
-    adb.action("new_action1") do
+    adb.action("sample::new_action1") do
       description "desc1"
+      endings [:first_ending, :second_ending]
     end
 
-    adb.action("new_action2") do
+    adb.action("sample::new_action2") do
       description "desc2"
+      endings ["success", "failure"]
     end
 
     expect(adb.instances.count).to eq(2)
     
     act1 = adb.instances[0]
+    expect(act1.namespace).to eq("sample")
     expect(act1.name).to eq("new_action1")
     expect(act1.description).to eq("desc1")
+    expect(act1.endings).to eq([:first_ending, :second_ending])
   
     act2 = adb.instances[1]
+    expect(act2.namespace).to eq("sample")
     expect(act2.name).to eq("new_action2")
     expect(act2.description).to eq("desc2")
+    expect(act2.endings).to eq([:success, :failure])
   end
 
   context "when reserved 'prospect' namespace is used for an action" do

data/spec/unit/internal/process_builder_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 require "stuka/internal/source_builders/process_builder"
-require "stuka/paths/stuka_paths"
+require "stuka/config/stuka_paths"
 
 
 describe "ProcessBuilder" do
@@ -8,36 +8,40 @@ describe "ProcessBuilder" do
   around(:each) do |example|
     FileUtils.rm_rf("#{Stuka::StukaPaths::TEST_PROCESSES_SOURCE_PATH}/.", secure: true)
     example.run
-    FileUtils.rm_rf("#{Stuka::StukaPaths::TEST_PROCESSES_SOURCE_PATH}/.", secure: true)
+    #FileUtils.rm_rf("#{Stuka::StukaPaths::TEST_PROCESSES_SOURCE_PATH}/.", secure: true)
   end
 
   it "builds ruby source with ProcessBuilder::build" do
     Stuka::ProcessBuilder.build
 
-    source_files = Dir["#{Stuka::StukaPaths::PROCESSES_SOURCE_PATH}/*.rb"]
+    source_files = Dir["#{Stuka::StukaPaths.processes_source_path}/*.rb"]
     source_files = source_files.map{ |path| File.basename(path) }
     expect(source_files.count).to eq(2)
-    expect(source_files.include? "test1.rb").to be(true)
+    expect(source_files.include? "check_smth.rb").to be(true)
     expect(source_files.include? "test2.rb").to be(true)
 
-    require_relative "processes_source_test/test1"
+    require_relative "processes_source_test/check_smth"
 
-    process = Test1.new
+    process = Processes::CheckSmth.new
 
-    expect(process.transition_map).to eq(
+    expect(process.blocks).to eq(
       {
-        "test::akcija" => {
-          success: "test::druga",
-          failure: "process::failure"
+        "test_block_1" => {
+          action: "bla::acc1",
+          success: "test_block_2",
+          failure: "process::failure",
         },
-        "test::druga" => {
+
+        "test_block_2" => {
+          action: "bla::acc2",
           success: "process::success",
-          failure: "process::failure"
-        }
+          failure: "process::failure",
+        },
+      
       }
     )
 
-    expect(process.start_action).to eq("test::akcija")
+    expect(process.start_block).to eq("test_block_1")
   
   end
 

data/spec/unit/internal/process_domain_builder_spec.rb

@@ -30,7 +30,7 @@ describe Stuka::ProcessDomainBuilder do
       pdb = Stuka::ProcessDomainBuilder.new
       pdb.build_domain
       expect(pdb.instances.count).to eq(2)
-      expect(pdb.instances.map(&:name).include? "test1").to be true
+      expect(pdb.instances.map(&:name).include? "check_smth").to be true
       expect(pdb.instances.map(&:name).include? "test2").to be true
     end
   end

data/spec/unit/internal/processes_dsl_test/correct_test_process.rb

@@ -1,32 +1,52 @@
-process "test1" do
-  description "pro description"
+process "check_smth" do
+  description "process checks smth"
 
-  start_action "test::akcija"
+  start_block "test_block_1"
 
-  action_transition "test::akcija",
-    success: "test::druga",
-    failure: "process::failure"
+  block "test_block_1" do
+    action "bla::acc1"
+    endings(
+      success: "test_block_2",
+      failure: "process::failure"
+    )
+  end
 
-  action_transition "test::druga",
-    success: "process::success",
-    failure: "process::failure"
+  block "test_block_2" do
+    action "bla::acc2"
+    endings(
+      success: "process::success",
+      failure: "process::failure"
+    )
+  end
 end
 
+
 process "test2" do
-  description "proc2 description"
+  description "process description"
+
+  start_block "block_1"
 
-  start_action "akcija"
-  action_transition "akcija",
-    success: "bla",
-    failure: "foo"
+  block "block_1" do
+    action "bla::acc1"
+    endings(
+      success: "process::success",
+      failure: "process::failure"
+    )
+  end
 end
 
-action "acc1" do
-  description "acc description"
-  namespace "bla"
+
+action "bla::acc1" do
+  description "acc description
+  some more
+  text"
+
+  endings [:success, :failure]
 end
 
-action "acc2" do
+
+action "bla::acc2" do
   description "acc description"
-  namespace "bla"
+  
+  endings [:success, :failure]
 end

data/stuka.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["david.sljukic@gmail.com"]
   spec.summary       = %q{Stuka is a dsl for managing business processes}
   spec.description   = %q{Stuka is a dsl for managing business processes yadda yadda}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/sljuka/stuka"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stuka
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
 platform: ruby
 authors:
 - David Sljukic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,10 +89,13 @@ files:
 - lib/stuka/commands/stuka_cli.rb
 - lib/stuka/commands/subcommands/create/create_process_file.rb
 - lib/stuka/commands/subcommands/create/create_project.rb
+- lib/stuka/commands/subcommands/setup/setup_config.rb
 - lib/stuka/commands/subcommands/setup/setup_directories.rb
 - lib/stuka/commands/subcommands/setup/setup_gemfile.rb
 - lib/stuka/commands/subcommands/setup/setup_rakefile.rb
 - lib/stuka/commands/subcommands/setup/setup_tasks.rb
+- lib/stuka/config/stuka_paths.rb
+- lib/stuka/config/template_config.rb
 - lib/stuka/external/action_finder.rb
 - lib/stuka/external/business_action.rb
 - lib/stuka/external/business_process.rb
@@ -100,7 +103,6 @@ files:
 - lib/stuka/external/process_states/finished_state.rb
 - lib/stuka/external/process_states/inactive_state.rb
 - lib/stuka/external/process_states/started_state.rb
-- lib/stuka/external/process_states/starting_state.rb
 - lib/stuka/external/unknown_action.rb
 - lib/stuka/internal/domain/action.rb
 - lib/stuka/internal/domain/domain.rb
@@ -113,31 +115,34 @@ files:
 - lib/stuka/internal/source_builders/process_builder.rb
 - lib/stuka/internal/source_builders/source_builder.rb
 - lib/stuka/internal/validator.rb
-- lib/stuka/paths/stuka_paths.rb
+- lib/stuka/monkeypatch/string_patch.rb
 - lib/stuka/templates/configs/gemfile.tt
+- lib/stuka/templates/configs/stuka_config.tt
 - lib/stuka/templates/definitions/process.tt
 - lib/stuka/templates/samples/my_first_step.tt
-- lib/stuka/templates/samples/my_process.tt
 - lib/stuka/templates/samples/my_second_step.tt
+- lib/stuka/templates/samples/process_file.tt
 - lib/stuka/templates/source/action.tt
+- lib/stuka/templates/source/action_header.tt
 - lib/stuka/templates/source/process.tt
+- lib/stuka/templates/source/process_header.tt
 - lib/stuka/templates/tasks/stuka.tt
 - lib/stuka/version.rb
 - spec/aceptance/commands/new_command_spec.rb
 - spec/aceptance/commands/process_command_spec.rb
 - spec/aceptance/commands/setup_command_spec.rb
 - spec/aceptance/external/action_aceptance_spec.rb
+- spec/aceptance/external/actions/cat/check_food.rb
+- spec/aceptance/external/actions/cat/fill_up_plate.rb
+- spec/aceptance/external/actions/cat/go_to_store.rb
 - spec/aceptance/external/feed_cat_process_aceptance_spec.rb
-- spec/aceptance/external/processes/cat/check_food.rb
-- spec/aceptance/external/processes/cat/fill_up_plate.rb
-- spec/aceptance/external/processes/cat/go_to_store.rb
 - spec/aceptance/external/processes/feed_cat_process.rb
 - spec/spec_helper.rb
-- spec/unit/external/example_source/create_world.rb
-- spec/unit/external/example_source/kill_monster.rb
-- spec/unit/external/example_source/world/gather_materials.rb
-- spec/unit/external/example_source/world/scrap_world.rb
-- spec/unit/external/example_source/world/seperate_light_from_darkness.rb
+- spec/unit/external/example_source/actions/world/gather_materials.rb
+- spec/unit/external/example_source/actions/world/scrap_world.rb
+- spec/unit/external/example_source/actions/world/seperate_light_from_darkness.rb
+- spec/unit/external/example_source/processes/create_world.rb
+- spec/unit/external/example_source/processes/kill_monster.rb
 - spec/unit/external/finder_spec.rb
 - spec/unit/external/process_interface.rb
 - spec/unit/external/process_to_action.rb
@@ -154,7 +159,7 @@ files:
 - spec/unit/internal/processes_dsl_test/correct_test_process.rb
 - spec/unit/internal/processes_dsl_test_incorrect/incorrect_test_process.rb
 - stuka.gemspec
-homepage: ''
+homepage: https://github.com/sljuka/stuka
 licenses:
 - MIT
 metadata: {}
@@ -183,17 +188,17 @@ test_files:
 - spec/aceptance/commands/process_command_spec.rb
 - spec/aceptance/commands/setup_command_spec.rb
 - spec/aceptance/external/action_aceptance_spec.rb
+- spec/aceptance/external/actions/cat/check_food.rb
+- spec/aceptance/external/actions/cat/fill_up_plate.rb
+- spec/aceptance/external/actions/cat/go_to_store.rb
 - spec/aceptance/external/feed_cat_process_aceptance_spec.rb
-- spec/aceptance/external/processes/cat/check_food.rb
-- spec/aceptance/external/processes/cat/fill_up_plate.rb
-- spec/aceptance/external/processes/cat/go_to_store.rb
 - spec/aceptance/external/processes/feed_cat_process.rb
 - spec/spec_helper.rb
-- spec/unit/external/example_source/create_world.rb
-- spec/unit/external/example_source/kill_monster.rb
-- spec/unit/external/example_source/world/gather_materials.rb
-- spec/unit/external/example_source/world/scrap_world.rb
-- spec/unit/external/example_source/world/seperate_light_from_darkness.rb
+- spec/unit/external/example_source/actions/world/gather_materials.rb
+- spec/unit/external/example_source/actions/world/scrap_world.rb
+- spec/unit/external/example_source/actions/world/seperate_light_from_darkness.rb
+- spec/unit/external/example_source/processes/create_world.rb
+- spec/unit/external/example_source/processes/kill_monster.rb
 - spec/unit/external/finder_spec.rb
 - spec/unit/external/process_interface.rb
 - spec/unit/external/process_to_action.rb

data/lib/stuka/external/process_states/starting_state.rb

@@ -1,16 +0,0 @@
-module Stuka
-
-  class StartingState
-
-    def handle_transition(context, transition)
-      context.instance_eval do
-        set_current_action(start_action)
-        start_action_class = transition_helper.find_action(start_action)
-        change_state(:started)
-        start_action_class.new(context).run(action_params)
-      end
-    end
-
-  end
-
-end

data/lib/stuka/paths/stuka_paths.rb

@@ -1,18 +0,0 @@
-module Stuka
-
-  module StukaPaths
-
-    PROCESSES_DEFINITION_PATH = "#{Dir.pwd}/process_definition"
-
-    PROCESSES_SOURCE_PATH = "#{Dir.pwd}/processes"
-
-    TEST_PROCESSES_DEFINITION_PATH = "#{File.expand_path(File.dirname(__FILE__))}/../../../spec/unit/internal/processes_dsl_test"
-    TEST_PROCESSES_INCORRECT_DEFINITION_PATH = "#{File.expand_path(File.dirname(__FILE__))}/../../../spec/unit/internal/processes_dsl_test_incorrect"
-
-    TEST_PROCESSES_SOURCE_PATH = "#{File.expand_path(File.dirname(__FILE__))}/../../../spec/unit/internal/processes_source_test"
-
-    TEMPLATES_PATH = "#{File.expand_path(File.dirname(__FILE__))}/../templates"
-
-  end
-
-end

data/lib/stuka/templates/samples/my_process.tt

@@ -1,19 +0,0 @@
-
-process "this is an example process" { |p|
-
-  p.name "my process"
-  p.attributes ["repo", "example_attribute"]
-
-  p.start_step "example:my_first_step"
-  
-  p.step_transition "example:my_first_step" { |a|
-    a.success "example:my_second_step"
-    a.failure process_failure
-  }
-
-  p.step_transition "example:my_second_step" { |a|
-    a.success process_success
-    a.failure process_failure
-  }
-
-}

data/spec/aceptance/external/processes/cat/check_food.rb

@@ -1,14 +0,0 @@
-require "stuka/external/business_action"
-
-module Cat
-
-  class CheckFood < Stuka::BusinessAction
-
-    def run(params)
-      params[:outstream].puts "There is enaugh food"
-      has_food(params)
-    end
-
-  end
-
-end

data/spec/aceptance/external/processes/cat/fill_up_plate.rb

@@ -1,14 +0,0 @@
-require "stuka/external/business_action"
-
-module Cat
-
-  class FillUpPlate < Stuka::BusinessAction
-
-    def run(params)
-      params[:outstream].puts "#{params[:name]}'s food plate filled up"
-      success(params)
-    end
-
-  end
-
-end

data/spec/aceptance/external/processes/cat/go_to_store.rb

@@ -1,14 +0,0 @@
-require "stuka/external/business_action"
-
-module Cat
-
-  class GoToStore < Stuka::BusinessAction
-
-    def run(params)
-      params[:outstream].puts "went to store"
-      success(params)
-    end
-
-  end
-
-end