artbase 0.1.0 → 0.2.2

data/lib/artbase/tool.rb

@@ -1,159 +1,220 @@
-
-
-
-module Artbase
-class Tool
-
-  def self.collection=(value)
-    puts "  setting collection to:"
-    pp value
-
-    @collection = value
-  end
-
-
-  def self.main( args=ARGV )
-    puts "==> welcome to collection tool with args:"
-    pp args
-
-    options = { }
-    parser = OptionParser.new do |opts|
-
-      opts.on("--offset NUM", Integer,
-              "Start counting at offset (default: 0)") do |num|
-          options[ :offset]  = num
-      end
-
-      opts.on("--limit NUM", Integer,
-              "Limit collection (default: ∞)") do |num|
-          options[ :limit]  = num
-      end
-
-      ## todo/fix: unsupported argument type: Range
-      ## opts.on("--range RANGE", Range,
-      ##        "Range of collection (default: 0..∞") do |range|
-      ##    options[ :range]  = range
-      ## end
-
-      opts.on("-h", "--help", "Prints this help") do
-        puts opts
-        exit
-      end
-    end
-
-    parser.parse!( args )
-    puts "options:"
-    pp options
-
-    puts "args:"
-    pp args
-
-    if args.size < 2
-      puts "!! ERROR - no command found - use <collection> <command>..."
-      puts ""
-      exit
-    end
-
-    name       = args[0]   ## todo/check - use collection_name/slug or such?
-    command    = args[1]
-    subcommand = args[2]
-
-
-    path = "./#{name}/config.rb"
-    puts "==> reading collection config >#{path}<..."
-
-    ## note: assume for now global const COLLECTION gets set/defined!!!
-    ##   use/change to a script/dsl loader/eval later!!!
-    load( path )
-
-    ## pp COLLECTION
-
-    ## configure collection  (note: requires self)
-    self.collection = COLLECTION
-
-
-    if ['d','dl','down', 'download'].include?( command )
-      if subcommand
-         if ['m', 'meta'].include?( subcommand )
-           download_meta
-         elsif ['i', 'img', 'image', 'images'].include?( subcommand )
-           download_images
-         end
-      else
-        download_meta
-        download_images
-      end
-    elsif ['p', 'px', 'pix', 'pixel', 'pixelate'].include?( command )
-      pixelate( offset: options[ :offset] )
-    elsif ['m', 'meta'].include?( command )
-      download_meta
-    elsif ['i', 'img', 'image', 'images'].include?( command )
-      download_images( offset: options[ :offset] )
-    elsif ['a', 'attr', 'attributes'].include?( command )
-      dump_attributes
-    elsif ['x', 'exp', 'export'].include?( command )
-      export_attributes
-    elsif ['c', 'composite'].include?( command )
-      make_composite
-    elsif ['t', 'test'].include?( command )
-       puts "  testing, testing, testing"
-    else
-      puts "!! ERROR - unknown command >#{command}<, sorry"
-    end
-
-    puts "bye"
-  end
-
-  def self.make_composite
-    puts "==> make composite"
-    @collection.make_composite
-  end
-
-  def self.dump_attributes
-    puts "==> dump attributes"
-    @collection.dump_attributes
-  end
-
-  def self.export_attributes
-    puts "==> export attributes"
-    @collection.export_attributes
-  end
-
-
-  def self.download_meta
-      puts "==> download meta"
-      @collection.download_meta
-  end
-
-  def self.download_images( offset: )
-     puts "==> download images"
-
-    ## note: use three dots (...) to exclude e.g. count 100 => 0 to 99)
-    range = if offset
-               (offset...@collection.count)
-            else
-               (0...@collection.count)
-            end
-
-     @collection.download_images( range )
-  end
-
-  def self.pixelate( offset: )
-    puts "==> pixelate"
-
-    ## note: use three dots (...) to exclude e.g. count 100 => 0 to 99)
-    range = if offset
-               (offset...@collection.count)
-            else
-               (0...@collection.count)
-            end
-
-    @collection.pixelate( range )
-  end
-end # class Tool
-
-
-end # module Artbase
-
-
-
+
+
+
+module Artbase
+class Tool
+
+  def self.collection=(value)
+    puts "  setting collection to:"
+    pp value
+
+    @collection = value
+  end
+
+
+  def self.main( args=ARGV )
+    puts "==> welcome to collection tool with args:"
+    pp args
+
+
+    options = { faster: false,
+                mirror: false,
+              }
+
+    parser = OptionParser.new do |opts|
+
+      opts.on("--offset NUM", Integer,
+              "Start counting at offset (default: 0)") do |num|
+          options[ :offset]  = num
+      end
+
+      opts.on("--limit NUM", Integer,
+              "Limit collection (default: ∞)") do |num|
+          options[ :limit]  = num
+      end
+
+      ## todo/fix: unsupported argument type: Range
+      ## opts.on("--range RANGE", Range,
+      ##        "Range of collection (default: 0..∞") do |range|
+      ##    options[ :range]  = range
+      ## end
+
+      opts.on( "--faster", "Use faster (optional) pixelate binary (default: false)") do
+          options[ :faster ] = true
+      end
+
+      opts.on( "--mirror", "Mirror (or flip) images (default: false)" ) do
+          options[ :mirror ] = true
+      end
+
+
+      opts.on("-h", "--help", "Prints this help") do
+        puts opts
+        exit
+      end
+    end
+
+    parser.parse!( args )
+    puts "options:"
+    pp options
+
+    puts "args:"
+    pp args
+
+    if args.size < 2
+      puts "!! ERROR - no command found - use <collection> <command>..."
+      puts ""
+      exit
+    end
+
+    name       = args[0]   ## todo/check - use collection_name/slug or such?
+    command    = args[1]
+    subcommand = args[2]
+
+    if File.exist?( "./#{name}/collection.yml" )
+       path = "./#{name}/collection.yml"
+       puts "==> reading collection config >#{path}<..."
+       config = read_yaml( path )
+
+       ## todo - use TokenCollection.read( ) or such -- why? why not?
+       ##           or TokenCollection.build( hash ) ?? - why? why not?
+       self.collection = TokenCollection.new(
+         config['slug'],
+         config['count'],
+         token_base: config['token_base'],
+         image_base: config['image_base'],
+         format: config['format'],
+         source: config['source'],
+         offset: config['offset'] || 0
+       )
+    else
+      ## todo/check: keep config.rb alternate name - why? why not?
+      ##    or use collection.rb only ???
+      path = if File.exist?( "./#{name}/config.rb" )
+                 "./#{name}/config.rb"
+             else
+                 "./#{name}/collection.rb"
+             end
+      puts "==> reading collection config >#{path}<..."
+
+      ## note: assume for now global const COLLECTION gets set/defined!!!
+      ##   use/change to a script/dsl loader/eval later!!!
+      load( path )
+
+      ## pp COLLECTION
+
+      ## configure collection  (note: requires self)
+      self.collection = COLLECTION
+    end
+
+    if ['d','dl','down', 'download'].include?( command )
+      if subcommand
+         if ['m', 'meta'].include?( subcommand )
+           download_meta
+         elsif ['i', 'img', 'image', 'images'].include?( subcommand )
+           download_images
+         end
+      else
+        download_meta
+        download_images
+      end
+    elsif ['p', 'px', 'pix', 'pixel', 'pixelate'].include?( command )
+      pixelate( offset: options[ :offset],
+                faster: options[ :faster] )
+    elsif ['m', 'meta'].include?( command )
+      download_meta( offset: options[ :offset] )
+    elsif ['i', 'img', 'image', 'images'].include?( command )
+      download_images( offset: options[ :offset] )
+    elsif ['conv', 'convert'].include?( command )
+      convert_images
+    elsif ['a', 'attr', 'attributes'].include?( command )
+      dump_attributes
+    elsif ['x', 'exp', 'export'].include?( command )
+      export_attributes
+    elsif ['c', 'composite'].include?( command )
+      make_composite( limit: options[ :limit],
+                      mirror: options[ :mirror ])
+    elsif ['strip'].include?( command )
+      make_strip
+    elsif ['t', 'test'].include?( command )
+       puts "  testing, testing, testing"
+    else
+      puts "!! ERROR - unknown command >#{command}<, sorry"
+    end
+
+    puts "bye"
+  end
+
+  def self.make_composite( limit: nil, mirror: false )
+    puts "==> make composite"
+    @collection.make_composite( limit: limit, mirror: mirror )
+  end
+
+  def self.convert_images
+    puts "==> convert images"
+    @collection.convert_images( overwrite: false )
+  end
+
+
+  def self.make_strip
+    puts "==> make strip"
+    @collection.make_strip
+  end
+
+
+  def self.dump_attributes
+    puts "==> dump attributes"
+    @collection.dump_attributes
+  end
+
+  def self.export_attributes
+    puts "==> export attributes"
+    @collection.export_attributes
+  end
+
+
+  def self.download_meta( offset: )
+      puts "==> download meta"
+
+      range = if offset
+                @collection._range( offset: offset )
+              else
+                @collection._range
+              end
+
+      @collection.download_meta( range )
+  end
+
+
+  def self.download_images( offset: )
+     puts "==> download images"
+
+    range = if offset
+              @collection._range( offset: offset )
+            else
+              @collection._range
+            end
+
+     @collection.download_images( range )
+  end
+
+
+  def self.pixelate( offset:,
+                     faster: )
+    puts "==> pixelate"
+
+    range = if offset
+              @collection._range( offset: offset )
+            else
+              @collection._range
+            end
+
+    @collection.pixelate( range, faster: faster )
+  end
+end # class Tool
+
+
+end # module Artbase
+
+
+

data/lib/artbase/version.rb

@@ -1,22 +1,21 @@
-
-
-module Artbase
-
-  MAJOR = 0
-  MINOR = 1
-  PATCH = 0
-  VERSION = [MAJOR,MINOR,PATCH].join('.')
-
-  def self.version
-    VERSION
-  end
-
-  def self.banner
-    "artbase/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"
-  end
-
-  def self.root
-    File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )
-  end
-
-end # module Artbase
+
+
+module Artbase
+  MAJOR = 0
+  MINOR = 2
+  PATCH = 2
+  VERSION = [MAJOR,MINOR,PATCH].join('.')
+
+  def self.version
+    VERSION
+  end
+
+  def self.banner
+    "artbase/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}] in (#{root})"
+  end
+
+  def self.root
+    File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )
+  end
+
+end # module Artbase

data/lib/artbase.rb

@@ -1,42 +1,78 @@
-require 'pp'
-require 'time'
-require 'date'
-
-require 'uri'
-require 'net/http'
-require 'net/https'
-require 'cgi'
-require 'fileutils'
-
-require 'json'
-
-require 'optparse'
-
-
-
-## our own gems
-require 'pixelart'
-
-
-
-
-
-## our own code
-require 'artbase/version'    # note: let version always go first
-
-require 'artbase/image'
-
-
-require 'artbase/helper'
-require 'artbase/opensea'
-
-require 'artbase/collection'
-require 'artbase/attributes'
-
-
-require 'artbase/tool'
-
-
-
-puts Artbase.banner
-puts Artbase.root
+require 'cocos'
+
+
+
+## 3rd party gems
+require 'pixelart'
+
+
+
+
+## our own code
+require_relative 'artbase/version'    # note: let version always go first
+
+
+### add (shared) "global" config
+module Artbase
+class Configuration
+
+  #######################
+  ## accessors
+
+  ##  todo/check:  keep trailing / in ipfs_gateway - why? why not?
+  def ipfs_gateway()       @ipfs_gateway || 'https://ipfs.io/ipfs/'; end
+  def ipfs_gateway=(value) @ipfs_gateway = value; end
+end # class Configuration
+
+
+## lets you use
+##   Artbase.configure do |config|
+##      config.ipfs_gateway = 'https://cloudflare-ipfs.com/ipfs/'
+##   end
+def self.configure() yield( config ); end
+def self.config()    @config ||= Configuration.new;  end
+end  # module Artbase
+
+
+require_relative 'artbase/image'
+
+
+require_relative 'artbase/helper'
+require_relative 'artbase/retry'    ## (global) retry_on_error helper
+
+require_relative 'artbase/collection'
+require_relative 'artbase/attributes'
+
+
+require_relative 'artbase/tool'
+
+
+
+######
+## move to helper - why? why not?
+
+
+
+## quick ipfs (interplanetary file system) hack
+##   - make more reuseable
+##   - different name  e.g. ipfs_to_http or such - why? why not?
+##   change/rename parameter str to url or suc - why? why not?
+def handle_ipfs( str, normalize:    true,
+                      ipfs_gateway: Artbase.config.ipfs_gateway )
+
+  if normalize && str.start_with?( 'https://ipfs.io/ipfs/' )
+    str = str.sub( 'https://ipfs.io/ipfs/', 'ipfs://' )
+  end
+
+  if str.start_with?( 'ipfs://' )
+    str = str.sub( 'ipfs://', ipfs_gateway )   # use/replace with public gateway
+  end
+  str
+end
+
+
+
+
+
+puts Artbase.banner
+puts Artbase.root

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: artbase
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cocos
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: webclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: pixelart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -36,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.22'
+        version: '3.23'
 description: artbase
 email: wwwmake@googlegroups.com
 executables:
@@ -51,12 +93,10 @@ executables:
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
-- LICENSE.md
 - Manifest.txt
 - README.md
 files:
 - CHANGELOG.md
-- LICENSE.md
 - Manifest.txt
 - README.md
 - Rakefile
@@ -64,16 +104,14 @@ files:
 - lib/artbase.rb
 - lib/artbase/attributes.rb
 - lib/artbase/collection.rb
+- lib/artbase/collection/base.rb
 - lib/artbase/collection/image.rb
 - lib/artbase/collection/opensea.rb
 - lib/artbase/collection/token.rb
 - lib/artbase/helper.rb
 - lib/artbase/image.rb
-- lib/artbase/image/24x24.rb
-- lib/artbase/image/32x32.rb
-- lib/artbase/image/60x60.rb
-- lib/artbase/image/80x80.rb
-- lib/artbase/opensea.rb
+- lib/artbase/image/sample.rb
+- lib/artbase/retry.rb
 - lib/artbase/tool.rb
 - lib/artbase/version.rb
 homepage: https://github.com/pixelartexchange/artbase
@@ -97,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: artbase