nmg 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3146dd36c1eb1813e107e700e617a2edb526acb
-  data.tar.gz: 7b84da0990de2fa9c4a9117e9ee7acc9b1957f91
+  metadata.gz: d1ae617c95c4a53e6e2af74e8a7c9fe446c53152
+  data.tar.gz: b42d1887068b227879fd5a9b5cb532aab878eefe
 SHA512:
-  metadata.gz: d1b6f082b66a6d8737ba1ab655d677b9a5af38cfea17f45b13c8cc0aef87b41674cc38ae637140be089aabd962bc625cc9a32e78fc5bd70662f07ffb9d66eae7
-  data.tar.gz: b373a23fc54c369dedd61867600412fa7a4e71a9de2fdd05ecda99c3d27ec0b8df045f12e87aa43d51605d62bb94ba61567d572f9f2931a44f473d9c0004ef17
+  metadata.gz: 1884a297580c731fe8147391dd801aac368b84a3a34e0093a6191ae419d03dca97c8d473bb22bef5dd67678d117ffdf363d8e57d310f833bbe815d5c52f2d766
+  data.tar.gz: ea40907d9689e9d5e03f3a9acec4195ef07c06b64996d3f9ad3bfd7ce78036ae7a597fea99087b53425e16af95b508f4d6d2546176d2bec09b4599ce86ec57a8

data/bin/nmg

@@ -26,14 +26,15 @@ class Nmg::CLI < Thor
   option :operations,
     type: :numeric,
     aliases: %w(-o --opts),
-    desc: 'Count of operations per process (by default the same as machines count)'
+    desc: 'Count of operations per process',
+    default: 3
   option :'maintenance-duration-min',
     type: :numeric,
-    default: 1,
+    default: 10,
     desc: 'Minimum maintenance duration'
   option :'maintenance-duration-max',
     type: :numeric,
-    default: 20,
+    default: 50,
     desc: 'Maximum maintenance duration'
   option :'maintenance-step-min',
     type: :numeric,
@@ -45,15 +46,23 @@ class Nmg::CLI < Thor
     desc: 'Maximum time between two maintenances'
   option :'operation-duration-min',
     type: :numeric,
-    default: 1,
+    default: 10,
     desc: 'Minimum operation duration'
   option :'operation-duration-max',
     type: :numeric,
-    default: 20,
+    default: 50,
     desc: 'Maximum operation duration'
+  option :'preparation-min',
+    type: :numeric,
+    default: 5,
+    desc: 'Minimum preparation time'
+  option :'preparation-max',
+    type: :numeric,
+    default: 25,
+    desc: 'Maximum preparation time'
   def generate(file)
     machine_opts = {
-      machines_count: options[:maintenances],
+      maintenences_count: options[:maintenances],
       maintenances: {
         from: options[:'maintenance-duration-min'],
         to: options[:'maintenance-duration-max'],
@@ -66,7 +75,9 @@ class Nmg::CLI < Thor
     task_opts = {
       operations: options[:operations] || options[:machines],
       min: options[:'operation-duration-min'],
-      max: options[:'operation-duration-max']
+      max: options[:'operation-duration-max'],
+      prep_min: options[:'preparation-min'],
+      prep_max: options[:'preparation-max']
     }
     hash = {
       machines: Nmg::Type::Machine.generate(options[:machines], machine_opts),

data/lib/nmg/type/machine.rb

@@ -4,8 +4,6 @@ module Nmg
       attribute :maintenances, Array[Maintenance]
 
       def self.generate(count, options = {}, gen = Random.new)
-        options = {maintenances_count: 10}.merge(options)
-
         maintenances_count = options[:maintenances_count]
 
         count.times.map do

data/lib/nmg/type/operation.rb

@@ -0,0 +1,23 @@
+module Nmg
+  module Type
+    class Operation < Base
+      attribute :preparation, Integer
+      attribute :duration, Integer
+
+      def to_json(options = {})
+        {
+          preparation: preparation,
+          duration: duration
+        }.to_json(options)
+      end
+
+      def self.generate(count, options = {}, gen = Random.new)
+        prep = (options[:prep_min]..options[:prep_max])
+        count.times.map do
+          new(preparation: gen.rand(prep),
+             duration: gen.rand(options[:min]..options[:max]))
+        end
+      end
+    end
+  end
+end

data/lib/nmg/type/process.rb

@@ -5,20 +5,17 @@ module Nmg
       # @!macro [attach] virtus.attribute
       #   @!attribute $1
       #     @return [$2] the $1 $0
-      attribute :operations, Array[Integer]
+      attribute :operations, Array[Operation]
 
       def to_json(options = {})
         operations.to_json(options)
       end
 
       def self.generate(count, options = {}, gen = Random.new)
-        options = {operations: 3, min: 1, max: 20}.merge(options)
-
         operations = options[:operations]
-        range = (options[:min]..options[:max])
 
         count.times.map do
-          new(operations: operations.times.map { gen.rand(range) })
+          new(operations: Operation.generate(operations, options))
         end
       end
     end

data/lib/nmg/version.rb

@@ -1,3 +1,3 @@
 module Nmg
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/nmg.rb

@@ -11,5 +11,6 @@ module Nmg
     autoload :Process,      'nmg/type/process'
     autoload :Machine,      'nmg/type/machine'
     autoload :Maintenance,  'nmg/type/maintenance'
+    autoload :Operation,    'nmg/type/operation'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nmg
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Łukasz Niemier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -99,6 +99,7 @@ files:
 - lib/nmg/type/base.rb
 - lib/nmg/type/machine.rb
 - lib/nmg/type/maintenance.rb
+- lib/nmg/type/operation.rb
 - lib/nmg/type/process.rb
 - lib/nmg/version.rb
 - nmg.gemspec