fattr 2.3.0 → 2.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 57f2c500d8d74df7c52da2ccaafc869e1d45117f
+  data.tar.gz: cbdef0846e66ae8024f51be65a8d7eea06a02eab
+SHA512:
+  metadata.gz: 3378a0d8d5d8219dae4f6943d69cfcf00d14fc5039b42d1236f0178ef79bf9a9c0afb084e02ca57212c43bfbee146663a95d90a11ab0e85e0dc2872c997db021
+  data.tar.gz: a0e6fbc36f5339bb2c2b3cd8c33e70a333f25ad36766fe18bdaece9abe2898ffee26fbd18a062804ddb97c3f6267da0b48416523cfa87166f774e06854b67e49

data/Rakefile

@@ -4,7 +4,7 @@ This.email = "ara.t.howard@gmail.com"
 This.homepage = "https://github.com/ahoward/#{ This.lib }"
 
 task :license do
-  open('LICENSE', 'w'){|fd| fd.puts "same as ruby's"}
+  open('LICENSE', 'w'){|fd| fd.puts "Ruby"}
 end
 
 task :default do
@@ -93,7 +93,7 @@ task :gemspec do
   test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
   summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
   description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
-  license     = object.respond_to?(:license) ? object.license : "same as ruby's"
+  license     = object.respond_to?(:license) ? object.license : "Ruby"
 
   if This.extensions.nil?
     This.extensions = []
@@ -104,39 +104,51 @@ task :gemspec do
   end
   extensions = [extensions].flatten.compact
 
+  if This.dependencies.nil?
+    dependencies = []
+  else
+    case This.dependencies
+      when Hash
+        dependencies = This.dependencies.values
+      when Array
+        dependencies = This.dependencies
+    end
+  end
+
   template = 
     if test(?e, 'gemspec.erb')
       Template{ IO.read('gemspec.erb') }
     else
       Template {
         <<-__
-          ## #{ lib }.gemspec
+          ## <%= lib %>.gemspec
           #
 
           Gem::Specification::new do |spec|
-            spec.name = #{ lib.inspect }
-            spec.version = #{ version.inspect }
+            spec.name = <%= lib.inspect %>
+            spec.version = <%= version.inspect %>
             spec.platform = Gem::Platform::RUBY
-            spec.summary = #{ lib.inspect }
-            spec.description = #{ description.inspect }
-            spec.license = #{ license.inspect }
+            spec.summary = <%= lib.inspect %>
+            spec.description = <%= description.inspect %>
+            spec.license = <%= license.inspect %>
 
-            spec.files =\n#{ files.sort.pretty_inspect }
-            spec.executables = #{ executables.inspect }
+            spec.files =\n<%= files.sort.pretty_inspect %>
+            spec.executables = <%= executables.inspect %>
             
             spec.require_path = "lib"
 
-            spec.test_files = #{ test_files.inspect }
+            spec.test_files = <%= test_files.inspect %>
 
-          ### spec.add_dependency 'lib', '>= version'
-          #### spec.add_dependency 'map'
+            <% dependencies.each do |lib_version| %>
+              spec.add_dependency(*<%= Array(lib_version).flatten.inspect %>)
+            <% end %>
 
-            spec.extensions.push(*#{ extensions.inspect })
+            spec.extensions.push(*<%= extensions.inspect %>)
 
-            spec.rubyforge_project = #{ This.rubyforge_project.inspect }
-            spec.author = #{ This.author.inspect }
-            spec.email = #{ This.email.inspect }
-            spec.homepage = #{ This.homepage.inspect }
+            spec.rubyforge_project = <%= This.rubyforge_project.inspect %>
+            spec.author = <%= This.author.inspect %>
+            spec.email = <%= This.email.inspect %>
+            spec.homepage = <%= This.homepage.inspect %>
           end
         __
       }
@@ -249,28 +261,35 @@ BEGIN {
 #
   This = OpenStruct.new
 
-  This.file = File.expand_path(__FILE__)
-  This.dir = File.dirname(This.file)
+  This.file   = File.expand_path(__FILE__)
+  This.dir    = File.dirname(This.file)
   This.pkgdir = File.join(This.dir, 'pkg')
 
-# grok lib
+  This.lib    = File.basename(Dir.pwd)
+  This._lib    = "#{ This.dir }/lib/#{ This.lib }/_lib.rb" 
+
+# load meta lib info
 #
-  lib = ENV['LIB']
-  unless lib
-    lib = File.basename(Dir.pwd).sub(/[-].*$/, '')
+  a = Object.constants.dup
+  require This._lib
+  b = Object.constants.dup
+  added = b - a
+  const = added.first
+
+  if added.size > 1
+    STDERR.puts "WARNING: defined multiple constants #{ added.inspect } in #{ _lib }, using #{ const } !!!"
   end
-  This.lib = lib
 
-# grok version
+  This.const   = const
+  This.object  = Object.const_get(This.const)
+  This.name    = This.object.name
+  This.version = This.object.send(:version)
+
+# see if dependencies are export by the module
 #
-  version = ENV['VERSION']
-  unless version
-    require "./lib/#{ This.lib }"
-    This.name = lib.capitalize
-    This.object = eval(This.name)
-    version = This.object.send(:version)
+  if This.object.respond_to?(:dependencies)
+    This.dependencies = This.object.dependencies
   end
-  This.version = version
 
 # we need to know the name of the lib an it's version
 #
@@ -279,12 +298,12 @@ BEGIN {
 
 # discover full path to this ruby executable
 #
-  c = Config::CONFIG
-  bindir = c["bindir"] || c['BINDIR']
+  c                 = RbConfig::CONFIG
+  bindir            = c["bindir"] || c['BINDIR']
   ruby_install_name = c['ruby_install_name'] || c['RUBY_INSTALL_NAME'] || 'ruby'
-  ruby_ext = c['EXEEXT'] || ''
-  ruby = File.join(bindir, (ruby_install_name + ruby_ext))
-  This.ruby = ruby
+  ruby_ext          = c['EXEEXT'] || ''
+  ruby              = File.join(bindir, (ruby_install_name + ruby_ext))
+  This.ruby         = ruby
 
 # some utils
 #

data/fattr.gemspec

@@ -3,11 +3,11 @@
 
 Gem::Specification::new do |spec|
   spec.name = "fattr"
-  spec.version = "2.3.0"
+  spec.version = "2.4.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "fattr"
   spec.description = "a \"fatter attr\" for ruby"
-  spec.license = "same as ruby's"
+  spec.license = "Ruby"
 
   spec.files =
 ["LICENSE",
@@ -16,7 +16,10 @@ Gem::Specification::new do |spec|
  "Rakefile",
  "fattr.gemspec",
  "lib",
+ "lib/fattr",
  "lib/fattr.rb",
+ "lib/fattr/_lib.rb",
+ "lib/fattr/version.rb",
  "samples",
  "samples/a.rb",
  "samples/b.rb",
@@ -36,8 +39,7 @@ Gem::Specification::new do |spec|
 
   spec.test_files = nil
 
-### spec.add_dependency 'lib', '>= version'
-#### spec.add_dependency 'map'
+  
 
   spec.extensions.push(*[])
 

data/lib/fattr.rb

@@ -1,10 +1,7 @@
 module Fattr
-  Fattr::Version = '2.3.0' unless Fattr.const_defined?(:Version)
-  def Fattr.version() Fattr::Version end
+  require_relative 'fattr/_lib.rb'
 
-  def Fattr.description
-    'a "fatter attr" for ruby'
-  end
+  SEMAPHORE = Mutex.new
 
   class List < ::Array
     attr_accessor :object
@@ -88,21 +85,21 @@ module Fattr
         end
       end
 
-      initializers = __fattrs__.initializers
+      #initializers = __fattrs__.initializers
 
-      names_and_configs.each do |name, config|
+      names_and_configs.each do |name, _config|
         raise(NameError, "bad instance variable name '@#{ name }'") if("@#{ name }" =~ %r/[!?=]$/o)
 
         name = name.to_s
 
         default = nil
-        default = config[:default] if config.has_key?(:default)
-        default = config['default'] if config.has_key?('default')
+        default = _config[:default] if _config.has_key?(:default)
+        default = _config['default'] if _config.has_key?('default')
 
         inheritable = false
         if Module===self
-          inheritable = config[:inheritable] if config.has_key?(:inheritable)
-          inheritable = config['inheritable'] if config.has_key?('inheritable')
+          inheritable = _config[:inheritable] if _config.has_key?(:inheritable)
+          inheritable = _config['inheritable'] if _config.has_key?('inheritable')
         end
 
         initialize = (
@@ -125,7 +122,7 @@ module Fattr
           Object.instance_method('instance_eval').bind(this).call(&initialize)
         end
 
-        initializer_id = initializer.object_id
+        #initializer_id = initializer.object_id
 
         __fattrs__.initializers[name] = initializer
 
@@ -151,6 +148,7 @@ module Fattr
           def #{ name }(*value, &block)
             value.unshift block if block
             return self.send('#{ name }=', value.first) unless value.empty?
+            #SEMAPHORE.synchronize{ #{ name }! unless defined? @#{ name } }
             #{ name }! unless defined? @#{ name }
             @#{ name }
           end

data/lib/fattr/_lib.rb

@@ -0,0 +1,9 @@
+module Fattr
+  Fattr::Version = '2.4.0' unless Fattr.const_defined?(:Version)
+
+  def Fattr.version() Fattr::Version end
+
+  def Fattr.description
+    'a "fatter attr" for ruby'
+  end
+end

data/lib/fattr/version.rb

@@ -0,0 +1,9 @@
+module Fattr
+  Fattr::Version = '2.3.0' unless Fattr.const_defined?(:Version)
+
+  def Fattr.version() Fattr::Version end
+
+  def Fattr.description
+    'a "fatter attr" for ruby'
+  end
+end

data/test/fattr_test.rb

@@ -157,7 +157,7 @@ BEGIN {
 
       def self.testing(*args, &block)
         method = ["test", testno, slug_for(*args)].delete_if{|part| part.empty?}.join('_')
-        define_method("test_#{ testno }_#{ slug_for(*args) }", &block)
+        define_method(method, &block)
       end
 
       alias_method '__assert__', 'assert'
@@ -177,7 +177,7 @@ BEGIN {
         end
       end
 
-      module_eval &block
+      module_eval(&block)
       self
     end
   end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fattr
 version: !ruby/object:Gem::Version
-  version: 2.3.0
-  prerelease: 
+  version: 2.4.0
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies: []
 description: a "fatter attr" for ruby
 email: ara.t.howard@gmail.com
@@ -23,6 +22,8 @@ files:
 - Rakefile
 - fattr.gemspec
 - lib/fattr.rb
+- lib/fattr/_lib.rb
+- lib/fattr/version.rb
 - samples/a.rb
 - samples/b.rb
 - samples/c.rb
@@ -35,28 +36,27 @@ files:
 - test/fattr_test.rb
 homepage: https://github.com/ahoward/fattr
 licenses:
-- same as ruby's
+- Ruby
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: codeforpeople
-rubygems_version: 1.8.23.2
+rubygems_version: 2.6.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: fattr
 test_files: []
 has_rdoc: