Lerobot-Dataset-Ruby 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 244035b2c7eb6cf559933949e548ad146bf5b5fc4f85741cc583d0d663f2df0a
-  data.tar.gz: 4ecb290a52027bb0d1c250a61f4a31474e95e290e39b79b59084ae913caa8c52
+  metadata.gz: 46b187339341ea39b9482e55744dd2bc61b6ea5fe66c40ecd2fce3862781cb76
+  data.tar.gz: e8de384c72390d6a2aa1a65629967b6eadb6aa049351b34d864c48bc6dda37f9
 SHA512:
-  metadata.gz: 2ffbe6e6b3c0a3b226eef5b065010b281b26ac7c6e98edca3519087d6ed018bac646ddb79472d06757a094d513d538c24cf148cff33aaac2a6b80dd0a87f8866
-  data.tar.gz: 677f955ef392be20c35159ca73d49d33b87578b16b2b144c8b944b4b6baf4c4e0b24934693284c35203984b887907470981090a3b266e367bae89421ff07b8c6
+  metadata.gz: cd625cb1018498777126c4a68e9c5c8cec29cc823dbcefe7dfbae3de42f9ff37577cccb83a7830b6bbed1eb530ce6deef8d76ad11151a1026b01995d56b1d5b9
+  data.tar.gz: c1003fa30554f991b832b78897e4a1ccf97854e23dadbf7ea10a4de640d798c48906c46fba65c108bd8936418fc9f481c8946e3ea0b77b346d924ddd9a7be385

data/Rakefile

@@ -3,19 +3,17 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-desc "Compile native extension"
+desc "Compile C++ extension"
 task :compile do
-  so_file = File.expand_path("ext/opencv/libopencv.so", __dir__)
-  unless File.exist?(so_file)
-    system("cd #{File.expand_path('ext/opencv', __dir__)} && ruby extconf.rb && make", exception: true)
+  Dir.chdir("ext/opencv") do
+    system("ruby extconf.rb", exception: true) unless File.exist?("Makefile")
+    system("make", exception: true)
   end
 end
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+Rake::TestTask.new(:test => :compile) do |t|
+  t.libs << "test" << "lib"
   t.test_files = FileList["test/test_*.rb"]
 end
 
-task test: :compile
-task default: :test
+task default: :test

data/lib/Lerobot/Dataset/Ruby/writer.rb

@@ -31,11 +31,6 @@ module Lerobot
 
         # 録画開始（内部でLibopencvを呼び出す）
         def start_recording(path = nil, fps = nil)
-          begin
-            require 'libopencv'
-          rescue LoadError
-            require_relative '../../../../ext/opencv/libopencv'
-          end
           path ||= File.join(@output_dir, 'videos', 'rgb', 'chunk-000', 'file-000.mp4')
           Libopencv.start_recording(path, fps || @fps)
           image_bytes = Libopencv.take_picture
@@ -161,17 +156,15 @@ module Lerobot
           video_path = File.join(video_dir, 'file-000.mp4')
           FileUtils.mkdir_p(video_dir)
 
-          sample_candidates = [
-            File.expand_path('../../../../test/test.mp4', __dir__),
-            File.expand_path('../../../../public/test.mp4', __dir__),
-            File.join(__dir__, 'test', 'test.mp4'),
-            File.join(__dir__, 'public', 'test.mp4')
-          ]
-          sample_path = sample_candidates.find { |path| File.exist?(path) }
+          return video_path if File.exist?(video_path)
 
-          if !File.exist?(video_path) && sample_path
-            FileUtils.cp(sample_path, video_path)
-          end
+          gem_root = File.expand_path('../../../..', __dir__)
+          sample_path = [
+            File.join(gem_root, 'test', 'test.mp4'),
+            File.join(gem_root, 'public', 'test.mp4')
+          ].find { |path| File.exist?(path) }
+
+          FileUtils.cp(sample_path, video_path) if sample_path
           video_path
         end
 

data/lib/Lerobot/Dataset/Ruby.rb

@@ -1,12 +1,19 @@
 # frozen_string_literal: true
 
-require_relative "Ruby/version"
+begin
+  require "libopencv"
+rescue LoadError
+  ext_so = File.expand_path("../../../ext/opencv/libopencv", __dir__)
+  require ext_so if File.exist?("#{ext_so}.so")
+end
+
 require_relative "Ruby/reader"
 require_relative "Ruby/writer"
 
 module Lerobot
   module Dataset
     module Ruby
+      VERSION = "0.2.0"
       class Error < StandardError; end
     end
   end

data/lib/lerobot-dataset-ruby.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "Lerobot/Dataset/Ruby"

data/lib/lerobot.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "Lerobot/Dataset/Ruby"

data/test/minimal_lerobot_check.rb

@@ -2,8 +2,7 @@
 # frozen_string_literal: true
 
 require 'fileutils'
-require_relative '../lerobot_dataset_writer'
-require_relative '../ext/opencv/libopencv'
+require_relative '../lib/lerobot'
 
 root = File.expand_path('../output_dataset/robot_dataset', __dir__)
 FileUtils.rm_rf(root)

data/test/sample.rb

@@ -1,5 +1,4 @@
-require_relative '../lerobot_dataset_writer'
-require_relative '../ext/opencv/libopencv'
+require_relative '../lib/lerobot'
 
 # データセット書き込みインスタンス作成
 writer = LeRobotDatasetWriter.new(output_dir: File.expand_path('../output_dataset/robot_dataset', __dir__), fps: 30)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Lerobot-Dataset-Ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Harutodesu
@@ -70,8 +70,9 @@ files:
 - ext/opencv/libopencv.cpp
 - lib/Lerobot/Dataset/Ruby.rb
 - lib/Lerobot/Dataset/Ruby/reader.rb
-- lib/Lerobot/Dataset/Ruby/version.rb
 - lib/Lerobot/Dataset/Ruby/writer.rb
+- lib/lerobot-dataset-ruby.rb
+- lib/lerobot.rb
 - sig/Lerobot/Dataset/Ruby.rbs
 - test/minimal_lerobot_check.rb
 - test/sample.rb

data/lib/Lerobot/Dataset/Ruby/version.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Lerobot
-  module Dataset
-    module Ruby
-      VERSION = "0.1.0"
-    end
-  end
-end