stuka 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74fc3007949312b107b76456e72c5503136ce74b
-  data.tar.gz: 76c34a5347f65be674dbfc2b48f9920e3dc123c9
+  metadata.gz: e705b79ca5b428abbcf975536eb34e701a6c0bea
+  data.tar.gz: 3c39e964888ccd74b15f4b8309d2deb0a1c0312c
 SHA512:
-  metadata.gz: cd1cfdbd3c137b56ed2fc21c686bc5411936b6889a0da771595ae48f0224e7a05c767c1ebc779bcd3ea2dc38199e0f2cd18205b2454aac6deb342b9fc6f731d7
-  data.tar.gz: 32e150825c453ca72125c4af732685d8a7f518c9192d173e115b08d6a65deff531b46e8861f5166fa74eac2d9ba3743f0715919d572f543101a431a202a94840
+  metadata.gz: 4c8a9746f732794dbe531b2585b01062411767e9b14bf9009692c1c6437bcfc1ccf647852a53d76d3d4af95e9be35718124e193d315c0c94f57d0f49b7c61c8e
+  data.tar.gz: 2dd2c68dfce2d8a965c7521c60785b171bcbdcdd2a182587ce7877e9ac3f97a01b77ecce9c2ce40fbb4d182891253e63cf822b4f07e5219760fc8d2f4359c7a9

data/lib/stuka/commands/public_commands/new_command.rb

@@ -1,5 +1,5 @@
-require_relative "../command"
-require_relative "../subcommands/create/create_project"
+require "stuka/commands/command"
+require "stuka/commands/subcommands/create/create_project"
 
 module Stuka
 

data/lib/stuka/commands/public_commands/process_command.rb

@@ -1,14 +1,15 @@
-require_relative "../command"
-require_relative "../subcommands/create/create_process_file"
+require "stuka/commands/command"
+require "stuka/commands/subcommands/create/create_process_file"
 
 module Stuka
 
   class ProcessCommand < Command
     
     argument :name, :desc => "Name of the process"
+    argument :blocks, type: :array, default: [], :desc => "Name of blocks"
 
     def execute
-      Stuka::CreateProcessFile.new.create(name)
+      Stuka::CreateProcessFile.new.create(name, blocks)
     end
 
     def self.description
@@ -16,7 +17,7 @@ module Stuka
     end
 
     def self.usage
-      "process NAME"
+      "process NAME *BLOCK_NAMES"
     end
 
   end

data/lib/stuka/commands/public_commands/setup_command.rb

@@ -1,6 +1,6 @@
 module Stuka
 
-  require_relative "../command"
+  require "stuka/commands/command"
   Dir["#{File.dirname(__FILE__)}/../subcommands/setup/*.rb"].each { |file| require_relative file }
 
   class SetupCommand < Command

data/lib/stuka/commands/subcommands/create/create_process_file.rb

@@ -1,12 +1,14 @@
-require_relative "../../command"
+require "stuka/commands/command"
+require 'stuka/config/stuka_paths'
 
 module Stuka
 
   class CreateProcessFile < Command
 
-    def create(name)
+    def create(name, block_names)
       @name = name
-      template('templates/definitions/process.tt', "process_definition/business/#{name}.rb")
+      @block_names = block_names
+      template('templates/definitions/process.tt', "#{StukaPaths.processes_definition_path}/#{name}.rb")
     end
 
   end

data/lib/stuka/commands/subcommands/create/create_project.rb

@@ -1,4 +1,4 @@
-require_relative "../../command"
+require "stuka/commands/command"
 Dir["#{File.dirname(__FILE__)}/../setup/*.rb"].each { |file| require_relative file }
 
 

data/lib/stuka/commands/subcommands/setup/setup_config.rb

@@ -1,4 +1,4 @@
-require_relative "../../command"
+require "stuka/commands/command"
 
 module Stuka
 

data/lib/stuka/commands/subcommands/setup/setup_directories.rb

@@ -1,4 +1,4 @@
-require_relative "../../command"
+require "stuka/commands/command"
 require 'stuka/config/stuka_paths'
 require 'fileutils'
 
@@ -14,8 +14,8 @@ module Stuka
         return
       end
 
-      FileUtils.mkdir_p "processes_definition"
-      template('templates/samples/process_file.tt', "processes_definition/process_file.rb")
+      FileUtils.mkdir_p "process_definition"
+      template('templates/samples/process_file.tt', "process_definition/process_file.rb")
       say("\tSource directories setup")
    
     end

data/lib/stuka/commands/subcommands/setup/setup_gemfile.rb

@@ -1,4 +1,4 @@
-require_relative "../../command"
+require "stuka/commands/command"
 
 module Stuka
 

data/lib/stuka/commands/subcommands/setup/setup_rakefile.rb

@@ -1,4 +1,4 @@
-require_relative "../../command"
+require "stuka/commands/command"
 
 module Stuka
 

data/lib/stuka/commands/subcommands/setup/setup_tasks.rb

@@ -1,4 +1,4 @@
-require_relative "../../command"
+require "stuka/commands/command"
 
 module Stuka
 

data/lib/stuka/internal/domain/action.rb

@@ -5,7 +5,7 @@ module Stuka
   class Action < Domain
 
     # needed durring generation
-    attr_accessor :implementation
+    attr_accessor :implementation, :definition_file
 
     # must not be nil
     ATTRS = ["name", "description", "namespace", "endings"]
@@ -17,10 +17,11 @@ module Stuka
       super()
       raise "'process' namespace is reserved" if namespace == "process"
       @name = name
-      @description = description
       @namespace = namespace
+      @description = description
       @endings = endings.map(&:to_sym)
       @implementation = ""
+      @definition_file = ""
     end
 
     # redefined
@@ -40,6 +41,11 @@ module Stuka
         @endings
       end
     end
+
+    def full_name
+      "#{namespace}::#{name}"
+    end
+
   end
 
 end

data/lib/stuka/internal/domain/block.rb

@@ -0,0 +1,55 @@
+require_relative "domain"
+
+module Stuka
+
+  class Block < Domain
+
+    attr_accessor :defining_action, :referenced_action_name, :definition_file
+
+    # must not be nil
+    ATTRS = ["name", "endings"]
+
+    # must not be empty
+    REQUIRED_ATTRS = ["name", "endings"]
+
+    def initialize(name, endings = {})
+      super()
+      @name = name
+      @endings = endings
+    end
+
+    def reference_action(namespaced_name)
+      raise "already defining an action for block" if @defining_action
+      @referenced_action_name = namespaced_name
+    end
+
+    def action(action_namespaced_name, action_description = nil)
+      raise "action already referenced for block" if referenced_action_name
+      action_namespace, action_name = action_namespaced_name.split("::")
+      action_description = action_name unless action_description
+      @defining_action = Action.new(action_name, action_namespace, action_description)
+      @defining_action.definition_file = definition_file
+      @defining_action.endings(@endings.keys) if @endings
+    end
+
+    def endings(endings_hash = nil)
+      if endings_hash
+        @endings = endings_hash
+        defining_action.endings(endings_hash.keys) if defining_action
+      else
+        @endings
+      end
+    end
+
+    def action_namespaced_name
+      raise "no action in block" unless (defining_action || referenced_action_name)
+      if @defining_action
+        defining_action.full_name
+      else
+        referenced_action_name
+      end
+    end
+
+  end
+
+end

data/lib/stuka/internal/domain/process.rb

@@ -1,10 +1,12 @@
 require_relative "domain"
+require_relative "block"
 
 module Stuka
 
   class Process < Domain
 
     attr_reader :blocks
+    attr_accessor :definition_file
 
     # must not be nil
     ATTRS = ["name", "description", "start_block"]
@@ -12,44 +14,33 @@ module Stuka
     # must not be empty
     REQUIRED_ATTRS = ["name", "start_block"]
 
-    def initialize(name, description = nil, arguments = nil, start_block = nil)
+    def initialize(name, description = nil, start_block = nil)
       super()
-      @arguments = []
       @name = name
       @description = description
-      @arguments = arguments
       @start_block = start_block
       @blocks = []
-    end
-
-    ProcessBlock = Struct.new(:block_name, :action_name, :block_endings) do
-
-      def action(action_name = nil)
-        if action_name
-          self.action_name = action_name
-        else
-          self.action_name
-        end
-      end
-
-      def endings(endings_hash)
-        if endings_hash
-          self.block_endings = endings_hash
-        else
-          self.block_endings
-        end
-      end
-
+      @definition_file = ""
     end
 
     def block(block_name, &block)
       raise "block method requires a block" unless block_given?
-      process_block = ProcessBlock.new
-      process_block.block_name = block_name
+      process_block = Block.new(block_name)
+      process_block.definition_file = definition_file
       process_block.instance_eval(&block)
       @blocks << process_block
     end
 
+    def actions
+      all_actions = blocks.select { |block| block.defining_action }.map(&:defining_action)
+      filtered_actions = []
+      all_actions.each do |acc|
+        next if filtered_actions.map(&:name).include? acc.name
+        filtered_actions << acc
+      end
+      filtered_actions
+    end
+
   end
 
 end

data/lib/stuka/internal/domain_builders/action_domain_builder.rb

@@ -5,6 +5,13 @@ module Stuka
 
   class ActionDomainBuilder < DomainBuilder
 
+    attr_accessor :instances
+
+    def initialize
+      super()
+      @instances = []
+    end
+
     def action(name, &block)
       namespace, action_name = [nil, name]
       if name.include?("::")
@@ -16,8 +23,6 @@ module Stuka
       act
     end
 
-
-
   end
 
 end

data/lib/stuka/internal/domain_builders/domain_builder.rb

@@ -2,12 +2,12 @@ module Stuka
 
   class DomainBuilder
 
-    DOMAIN_OBJECTS = ["process", "action"]
+    attr_reader :current_file_path
 
-    attr_accessor :instances
+    DOMAIN_OBJECTS = ["process", "action"]
 
     def initialize
-      @instances = []
+      @current_file_path = ""
     end
 
     DOMAIN_OBJECTS.each do |object_name|
@@ -22,6 +22,7 @@ module Stuka
 
     def build_domain
       domain_files.each do |path|
+        @current_file_path = path
         instance_eval(File.read(path), path, __LINE__)
       end
       self

data/lib/stuka/internal/domain_builders/process_domain_builder.rb

@@ -5,10 +5,23 @@ module Stuka
 
   class ProcessDomainBuilder < DomainBuilder
 
+    attr_accessor :process_instances, :action_instances
+
+    def initialize
+      super()
+      @process_instances = []
+      @action_instances = []
+    end
+
     def process(name, &block)
       proc = Process.new(name)
+      proc.definition_file = current_file_path
       proc.instance_eval(&block)
-      @instances << proc
+      @process_instances << proc
+      proc.actions.each do |acc|
+        next if @action_instances.map(&:name).include? acc.name
+        @action_instances << acc
+      end
       proc
     end
 

data/lib/stuka/internal/source_builders/action_builder.rb

@@ -13,12 +13,18 @@ module Stuka
       adb = ActionDomainBuilder.new
       adb.build_domain
 
+      build_files(adb.instances, stream)
+
+    end
+
+    def self.build_files(instances, stream)
+
       template_file_header = "#{templates_path}/source/action_header.tt"
       template_file = "#{templates_path}/source/action.tt"
 
       FileUtils.mkdir_p Stuka::StukaPaths.actions_source_path
 
-      adb.instances.each do |acc|
+      instances.each do |acc|
         action_file_path = "#{source_path}/#{acc.namespace}"
         FileUtils.mkdir_p action_file_path
 

data/lib/stuka/internal/source_builders/process_builder.rb

@@ -1,6 +1,7 @@
 require 'stuka/internal/domain_builders/process_domain_builder'
 require 'stuka/internal/validator'
 require 'stuka/internal/source_builders/source_builder'
+require 'stuka/internal/source_builders/action_builder'
 require 'stuka/monkeypatch/string_patch'
 
 module Stuka
@@ -12,14 +13,16 @@ module Stuka
       pdb.build_domain
 
       validator = Stuka::Validator.new
-      raise validator.message unless validator.process_set_valid? pdb.instances
+      raise validator.message unless validator.process_set_valid? pdb.process_instances
 
       template_file_header = "#{templates_path}/source/process_header.tt"
       template_file = "#{templates_path}/source/process.tt"
 
       FileUtils.mkdir_p source_path
 
-      pdb.instances.each do |proc|
+      ActionBuilder.build_files(pdb.action_instances, $stdout)
+
+      pdb.process_instances.each do |proc|
         raise validator.message unless validator.process_valid? proc
 
         # generate action header
@@ -50,7 +53,7 @@ module Stuka
         out_file.puts(process_string)
         out_file.close
       end
-    
+
     end
 
     def self.source_path

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

@@ -1,39 +1,26 @@
 ##
 #
-# process "some_process" do
+# process "sample_process" do
 #   
-#   description "description of a process
-#   should be concise and long enaugh for
-#   new people to understand what the process does."
+#   description "description of a process."
 # 
-#   start_action "sample::action1"
+#   start_block "first_block"
 # 
-#   action_ending "sample::action1",
-#     success: "sample::action2",
-#     failure: "process::failure"
-# 
-#   action_ending "sample::action2",
-#     success: "process::success",
-#     failure: "process::failure"
-# 
-# end
-# 
-# action "action1" do
-#   
-#   description "the namespace is the name of the folder
-#   under which this action will be placed in the filesystem.
-#   'process' is a reserved namespace used for sending messages to process"
-# 
-#   namespace "sample"
-# end
-# 
-# action "action2" do
-#   
-#   description <<-DESC
-#   all actions used in the process
-#   must be defined, if an action is missing the stuka:build task will not pass"
-#   DESC
+#   block "first_block" do
+#     action "sample::action_1", "this is the description of action 1"   
+#     endings(
+#       success: "seccond_block",
+#       failure: "process::failure"
+#     )
+#   end
+#
+#   block "second_block" do
+#     action "sample::action_2", "this is the description of action 2"   
+#     endings(
+#       success: "process::success",
+#       failure: "process::failure"
+#     )
+#   end
 #
-#   namespace "sample"
 # end
 # 

data/lib/stuka/templates/source/action.tt

@@ -3,6 +3,7 @@ module <%= @namespace.camelcase_notation %>
 
     def run(params)
       # knock yourself out
+      raise NotImplementedError
     end
 
   end

data/lib/stuka/templates/source/action_header.tt

@@ -1,6 +1,9 @@
 ##<% @description.split("\n").each do |description_line| %><% require "stuka/config/template_config" %>
 # <%= description_line.strip %> <% end %>
 #
+# defined_at: <%= @definition_file %>
+#
+# endings: <%= @endings.join(', ') %>
 #
 <% if TemplateConfig.add_require_statements %>
 require "stuka/external/business_action"

data/lib/stuka/templates/source/process.tt

@@ -2,9 +2,9 @@ class <%= @name.camelcase_notation %> < Stuka::External::BusinessProcess
 
   Blocks = {
     <% @blocks.each do |block| %>
-    "<%= block.block_name %>" => {
-      action: "<%= block.action_name %>",
-      <% block.block_endings.each do |block_ending, next_block| %><%= block_ending %>: "<%= next_block %>",
+    "<%= block.name %>" => {
+      action: "<%= block.action_namespaced_name %>",
+      <% block.endings.each do |block_ending, next_block| %><%= block_ending %>: "<%= next_block %>",
       <% end %>
     },<% end %>
   }

data/lib/stuka/version.rb

@@ -1,3 +1,3 @@
 module Stuka
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/aceptance/commands/process_command_spec.rb

@@ -8,11 +8,12 @@ describe "process file command" do
     Stuka::StukaCli.start ["new", "test_pro"]
     example.run
     FileUtils.rm_rf 'test_pro'
+    FileUtils.rm_rf Dir["#{Stuka::StukaPaths.processes_definition_path}/test_process.rb"]
   end
 
   it "sets up the project" do
     Dir.chdir "test_pro" do
-      expect { Stuka::StukaCli.start ["process", "test_process"] }.to output(%r|create  process_definition/business/test_process.rb|).to_stdout
+      expect { Stuka::StukaCli.start ["process", "test_process"] }.to output(%r|create  .*/processes_dsl_test/test_process.rb|).to_stdout
       
       definition_files = Dir["#{Stuka::StukaPaths.processes_definition_path}/**/*.rb"]
       expect { definition_files.to include("#{Stuka::StukaPaths.processes_definition_path}/test_process.rb}") }

data/spec/unit/internal/action_builder_spec.rb

@@ -17,25 +17,26 @@ describe "ActionBuilder" do
     Stuka::ActionBuilder.build(stream)
 
     source_files = Dir["#{Stuka::StukaPaths.actions_source_path}/*/*.rb"]
+    puts Dir["#{Stuka::StukaPaths.processes_definition_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)
+    expect(source_files.include? "acc3.rb").to be(true)
+    expect(source_files.include? "acc4.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.")
+    expect(stream).to receive(:puts).with("action file bla::acc3 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)
+    expect(source_files.include? "acc3.rb").to be(true)
+    expect(source_files.include? "acc4.rb").to be(true)
 
   end
 
@@ -45,8 +46,8 @@ describe "ActionBuilder" do
 
     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
+    require_relative "#{File.dirname(__FILE__)}/actions_source_test/bla/acc3.rb"
+    expect(Bla::Acc3.instance_methods.include? :additional_method).to be true
   end
 
   private
@@ -68,7 +69,7 @@ describe "ActionBuilder" do
 require 'stuka/external/business_action'
 
 module Bla
-  class Acc1 < Stuka::External::BusinessAction
+  class Acc3 < Stuka::External::BusinessAction
 
     def run(params)
       params[stream].puts "test"
@@ -84,7 +85,7 @@ 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 = File.new("#{File.dirname(__FILE__)}/actions_source_test/bla/acc3.rb", "w")
     out_file.puts(file_content)
     out_file.close
   end

data/spec/unit/internal/process_builder_spec.rb

@@ -7,18 +7,20 @@ describe "ProcessBuilder" do
 
   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_PROCESSES_SOURCE_PATH}/.", secure: true)
+    FileUtils.rm_rf("#{Stuka::StukaPaths::TEST_ACTIONS_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 = source_files.map{ |path| File.basename(path) }
-    expect(source_files.count).to eq(2)
-    expect(source_files.include? "check_smth.rb").to be(true)
-    expect(source_files.include? "test2.rb").to be(true)
+    process_source_files = Dir["#{Stuka::StukaPaths.processes_source_path}/*.rb"]
+    process_source_files = process_source_files.map{ |path| File.basename(path) }
+    expect(process_source_files.count).to eq(2)
+    expect(process_source_files.include? "check_smth.rb").to be(true)
+    expect(process_source_files.include? "test2.rb").to be(true)
 
     require_relative "processes_source_test/check_smth"
 
@@ -45,4 +47,14 @@ describe "ProcessBuilder" do
   
   end
 
+  it "builds action source files that are defined inside blocks" do
+    Stuka::ProcessBuilder.build
+
+    action_source_files = Dir["#{Stuka::StukaPaths.actions_source_path}/**/*.rb"]
+    action_source_files = action_source_files.map{ |path| File.basename(path) }
+    expect(action_source_files.count).to eq(2)
+    expect(action_source_files.include? "acc1.rb").to be(true)
+    expect(action_source_files.include? "acc2.rb").to be(true)
+  end
+
 end

data/spec/unit/internal/process_cleaner_spec.rb

@@ -4,6 +4,14 @@ require "stuka/internal/source_builders/process_builder"
 
 describe "ProcessCleaner" do
 
+  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 "deletes ruby source with ProcessCleaner::clean" do
     Stuka::ProcessBuilder.build
     Stuka::ProcessCleaner.clean

data/spec/unit/internal/process_domain_builder_spec.rb

@@ -14,13 +14,13 @@ describe Stuka::ProcessDomainBuilder do
       description "desc2"
     end
 
-    expect(pdb.instances.count).to eq(2)
+    expect(pdb.process_instances.count).to eq(2)
 
-    proc1 = pdb.instances[0]
+    proc1 = pdb.process_instances[0]
     expect(proc1.name).to eq("new_process1")
     expect(proc1.description).to eq("desc1")
 
-    proc2 = pdb.instances[1]
+    proc2 = pdb.process_instances[1]
     expect(proc2.name).to eq("new_process2")
     expect(proc2.description).to eq("desc2")
   end
@@ -29,9 +29,19 @@ describe Stuka::ProcessDomainBuilder do
     it "evaluates correct test files with ProcessDomainBuilder#build_domain" do
       pdb = Stuka::ProcessDomainBuilder.new
       pdb.build_domain
-      expect(pdb.instances.count).to eq(2)
-      expect(pdb.instances.map(&:name).include? "check_smth").to be true
-      expect(pdb.instances.map(&:name).include? "test2").to be true
+      expect(pdb.process_instances.count).to eq(2)
+      expect(pdb.process_instances.map(&:name).include? "check_smth").to be true
+      expect(pdb.process_instances.map(&:name).include? "test2").to be true
+
+      expect(pdb.action_instances.count).to eq(2)
+
+      expect(pdb.action_instances[0].name).to eq("acc1")
+      expect(pdb.action_instances[0].definition_file).to eq "#{(Stuka::StukaPaths.processes_definition_path)}/correct_test_process.rb"
+      expect(pdb.action_instances[0].endings).to eq [:success, :failure]
+
+      expect(pdb.action_instances[1].name).to eq("acc2")
+      expect(pdb.action_instances[1].definition_file).to eq "#{(Stuka::StukaPaths.processes_definition_path)}/correct_test_process.rb"
+      expect(pdb.action_instances[1].endings).to eq [:success, :failure]
     end
   end
 

data/spec/unit/internal/process_validator_spec.rb

@@ -6,11 +6,11 @@ describe "Validator" do
 
   let(:validator) { Stuka::Validator.new }
 
-  let(:valid_process) { Stuka::Process.new("pr1", "pr2_desc", ["arg1", "arg2"], "start_action") }
-  let(:valid_process2) { Stuka::Process.new("pr2", "pr2_desc", [], "start_action") }
+  let(:valid_process) { Stuka::Process.new("pr1", "pr2_desc", "start_action") }
+  let(:valid_process2) { Stuka::Process.new("pr2", "pr2_desc", "start_action") }
 
-  let(:invalid_process) { Stuka::Process.new("pr3", nil, ["arg1", "arg2"], "start_action") }
-  let(:invalid_process2) { Stuka::Process.new("", "description", ["arg1", "arg2"], "start_action") }
+  let(:invalid_process) { Stuka::Process.new("pr3", nil, "start_action") }
+  let(:invalid_process2) { Stuka::Process.new("", "description", "start_action") }
 
   context "when testing single process" do
 

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

@@ -4,7 +4,7 @@ process "check_smth" do
   start_block "test_block_1"
 
   block "test_block_1" do
-    action "bla::acc1"
+    action "bla::acc1", "acc1 description"
     endings(
       success: "test_block_2",
       failure: "process::failure"
@@ -12,7 +12,7 @@ process "check_smth" do
   end
 
   block "test_block_2" do
-    action "bla::acc2"
+    action "bla::acc2", "acc2 description"
     endings(
       success: "process::success",
       failure: "process::failure"
@@ -27,7 +27,7 @@ process "test2" do
   start_block "block_1"
 
   block "block_1" do
-    action "bla::acc1"
+    action "bla::acc1", "acc1 description"
     endings(
       success: "process::success",
       failure: "process::failure"
@@ -35,8 +35,7 @@ process "test2" do
   end
 end
 
-
-action "bla::acc1" do
+action "bla::acc3" do
   description "acc description
   some more
   text"
@@ -45,7 +44,7 @@ action "bla::acc1" do
 end
 
 
-action "bla::acc2" do
+action "bla::acc4" do
   description "acc description"
   
   endings [:success, :failure]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stuka
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - David Sljukic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,7 @@ files:
 - lib/stuka/external/process_states/started_state.rb
 - lib/stuka/external/unknown_action.rb
 - lib/stuka/internal/domain/action.rb
+- lib/stuka/internal/domain/block.rb
 - lib/stuka/internal/domain/domain.rb
 - lib/stuka/internal/domain/process.rb
 - lib/stuka/internal/domain_builders/action_domain_builder.rb